X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Flive-initramfs%2Fgrml-script.init-top;h=462642dfe24dd759fe02487de9907390c315da37;hb=d58f511ab49efd880c365a9a40c662fa80e853a7;hp=40ab55d8ec8ed9e87e0c8cfc282754563ca160cc;hpb=60e413cbe79220b140d0c96d5cc487aa6c87aaa6;p=grml-live.git

diff --git a/etc/grml/fai/live-initramfs/grml-script.init-top b/etc/grml/fai/live-initramfs/grml-script.init-top
index 40ab55d..462642d 100755
--- a/etc/grml/fai/live-initramfs/grml-script.init-top
+++ b/etc/grml/fai/live-initramfs/grml-script.init-top
@@ -1,9 +1,26 @@
 #!/bin/sh
 
+# prereq header {{{
+# without this header booting will fail with:
+# "PANIC: Circular dependancy.  Exiting."
+PREREQ=""
+prereqs()
+{
+        echo "$PREREQ"
+}
+case $1 in
+# get pre-requisites
+prereqs)
+        prereqs
+        exit 0
+        ;;
+esac
+# }}}
+
 # helper functions {{{
 
 if grep -qe debug -qe verbose /proc/cmdline 2>/dev/null ; then
-   echo "debug: scripts/init-top/grml running"
+   echo "debug: scripts/init-top/grml running">/dev/console
 fi
 
 # get boot command line
@@ -95,7 +112,7 @@ FAILED=" ${NORMAL}[${RED}fail${NORMAL}]"
 DISTRI="$(getbootparam 'distri' 2>/dev/null)"
 
 if [ -r /etc/grml_version ] ; then
-   GRML_VERSION="[$(cat /etc/grml_version)] "
+   GRML_VERSION="$(cat /etc/grml_version)"
 fi
 
 if [ -n "$DISTRI" ] ; then
@@ -113,13 +130,18 @@ ${RED} | |  _| |_) | |\/| | |
 ${RED} | |_| |  _ <| |  | | |___
 ${RED}  \____|_| \_\_|  |_|_____|
 
-${WHITE}grml.org $GRML_VERSION- Linux for sysadmins and texttool users.
-${NORMAL}"
+${WHITE}grml.org - Linux for sysadmins and texttool users.${NORMAL}"
 fi
 
 echo ""
 echo "${WHITE}Welcome to"
 echo "$SPLASH"
+echo
+
+if [ -n "$GRML_VERSION" ] ; then
+   log_grml_begin_msg "Running $GRML_VERSION"
+   echo
+fi
 
 # don't output anything if running with bootsplash feature
 if checkbootparam "splash" ; then
@@ -127,6 +149,7 @@ if checkbootparam "splash" ; then
 fi
 # }}}
 
+## /proc/cmdline handling {{{
 # No kernel messages while probing modules:
 if ! grep -qe debug -qe verbose /proc/cmdline 2>/dev/null ; then
    [ -r /proc/sys/kernel/printk ] && echo "0" > /proc/sys/kernel/printk
@@ -140,7 +163,8 @@ fi
 if grep -q 'boot=live' /proc/cmdline 2>/dev/null ; then
    log_grml_begin_msg "Finished early booting sequence." ; echo "$SUCCESS"
    log_grml_begin_msg "Searching for GRML file, this might take a few seconds..."
-   echo 
+   echo
 fi
+## }}}
 
 # vim: foldmethod=marker expandtab ai ft=sh