X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Flive-initramfs%2Fgrml-script.init-top;h=a9bd2849b6db9c11120c2d32c3b23c12235ba0a8;hb=f6f5809bd71d7b9f77a5a6edd23f353e7a25f609;hp=5ed49b030a50c7f242c61cd53183cbff601c3f61;hpb=ef39c912b924d4d83eda2d39ce8586089db828e4;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 5ed49b0..a9bd284 100755
--- a/etc/grml/fai/live-initramfs/grml-script.init-top
+++ b/etc/grml/fai/live-initramfs/grml-script.init-top
@@ -3,7 +3,7 @@
 # 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
@@ -93,6 +93,11 @@ FAILED=" ${NORMAL}[${RED}fail${NORMAL}]"
 # welcome splash {{{
 
 DISTRI="$(getbootparam 'distri' 2>/dev/null)"
+
+if [ -r /etc/grml_version ] ; then
+   GRML_VERSION="$(cat /etc/grml_version)"
+fi
+
 if [ -n "$DISTRI" ] ; then
 SPLASH="
 ${RED} $DISTRI
@@ -108,20 +113,24 @@ ${RED} | |  _| |_) | |\/| | |
 ${RED} | |_| |  _ <| |  | | |___
 ${RED}  \____|_| \_\_|  |_|_____|
 
-${WHITE}grml.org - 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
+log_grml_begin_msg "Running $GRML_VERSION"
+echo
+
 # don't output anything if running with bootsplash feature
 if checkbootparam "splash" ; then
   exec >/dev/null </dev/null 2>&1
 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
@@ -135,7 +144,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