X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Flive-initramfs%2Fgrml-script.init-top;h=78d65aa1527c9c795633309e498d756e47c35517;hb=0de14d6dabc6bfa98934c2340f28dd9da6b479da;hp=ae29383ffa1e8919d9754754f5e21f275fdc3f53;hpb=8dfcd204e18d0a36b0f75cf622c24ad447e9ca1f;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 ae29383..78d65aa 100755
--- a/etc/grml/fai/live-initramfs/grml-script.init-top
+++ b/etc/grml/fai/live-initramfs/grml-script.init-top
@@ -2,7 +2,7 @@
 
 # helper functions {{{
 
-if ! grep -qe debug -qe verbose /proc/cmdline 2>/dev/null ; then
+if grep -qe debug -qe verbose /proc/cmdline 2>/dev/null ; then
    echo "debug: scripts/init-top/grml running"
 fi
 
@@ -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
@@ -109,7 +114,7 @@ ${RED} | |_| |  _ <| |  | | |___
 ${RED}  \____|_| \_\_|  |_|_____|
 
 ${WHITE}grml.org - Linux for sysadmins and texttool users.
-${NORMAL}"
+${WHITE}$GRML_VERSION${NORMAL}"
 fi
 
 echo ""
@@ -122,15 +127,22 @@ 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
 fi
 
+# Make sure we support squashfs:
+if ! grep -q squashfs /proc/filesystems ; then
+   modprobe -q squashfs || log_grml_failure_msg "Warning: look like you do not have support for squashfs"
+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