Fix code regression of checkbootparam

[grml-autoconfig.git] / grml-autoconfig

diff --git a/grml-autoconfig b/grml-autoconfig
index 43fdeae..1686c63 100755 (executable)
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Fre Aug 04 12:13:13 CEST 2006 [mika]
+# Latest change: Mit Jul 25 19:12:49 CEST 2007 [mika]
 ################################################################################
 
 # http://wiki.debian.org/LSBInitScripts =>
@@ -17,6 +17,7 @@
 # Default-Stop:
 ### END INIT INFO
 
+# {{{ placeholder functions for restart/reload/stop
 if [[ $1 == "restart" ]] ; then
   echo "$0 restart - empty placeholder. Doing nothing but running."
 fi
@@ -29,6 +30,7 @@ if [[ $1 == "stop" ]] ; then
   echo "$0 stop - empty placeholder. Doing nothing but exiting."
   exit 1
 fi
+# }}}
 
 # {{{ path, signals, umask, zsh, colors
 export PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin"
@@ -43,7 +45,7 @@ setopt no_nomatch # avoid 'no matches found: ...'
 # {{{ source main files
 source /etc/grml/autoconfig            # configuration file
 source /etc/grml/autoconfig.functions  # functions
-source /etc/grml/lsb-functions
+source /etc/grml/lsb-functions         # helper functions for smart display
 # }}}
 
 # {{{ mount important directories
@@ -61,7 +63,7 @@ CMDLINE="$(cat /proc/cmdline)"
 checkvalue $CONFIG_DEBUG && config_debug
 
 SPLASH=''
-if checkbootparam "splash" ; then
+if checkbootparam "textsplash" || checkbootparam "tsplash"; then
   SPLASH=1
 fi
 
@@ -78,6 +80,15 @@ else
   echo "6" > /proc/sys/kernel/printk ; eend $?
 fi
 
+if checkbootparam "forensic" ; then
+   eerror "Bootopion forensic found. Important notice!"
+   eerror " Do *not* boot with something like 'grml forensic ...' but with 'forensic ...' instead!"
+   eerror " To avoid damage to your system a debugshell will be started after a delay of 10 seconds." ; eend 1
+   eerror " If you want to continue booting just exit the shell, but think about what you are doing!" ; eend 1
+   sleep 10
+   rundebugshell
+fi
+
 [ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|">/dev/tty7
 
 checkvalue $CONFIG_LANGUAGE && config_language
@@ -102,6 +113,8 @@ checkvalue $CONFIG_KERNEL &&  config_kernel
 
 checkvalue $CONFIG_VMWARE &&  config_vmware
 
+checkvalue $CONFIG_QEMU && config_qemu
+
 checkvalue $CONFIG_SMALL && config_small
 
 checkvalue $CONFIG_LD_MOD && config_ld_mod
@@ -114,6 +127,10 @@ checkvalue $CONFIG_FAST && config_fast
 
 checkvalue $CONFIG_ENVIRONMENT && config_environment
 
+checkvalue $CONFIG_SWRAID && config_swraid
+
+checkvalue $CONFIG_LVM && config_lvm
+
 # No kernel messages while probing modules
 echo "0" > /proc/sys/kernel/printk
 
@@ -187,6 +204,10 @@ checkvalue $CONFIG_HOMEDIR && config_homedir
 
 checkvalue $CONFIG_MYCONFIG && config_myconfig
 
+checkvalue $CONFIG_DEBS && config_debs
+
+checkvalue $CONFIG_SCRIPTS && config_scripts
+
 [ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||">/dev/tty7
 
 checkvalue $CONFIG_CDROM_SCRIPTS && config_cdrom_scripts
@@ -231,16 +252,22 @@ checkvalue $CONFIG_CREATE_MNT_DIRS && create_mnt_dirs
 
 checkvalue $CONFIG_915RESOLUTION && config_915resolution
 
+checkvalue $CONFIG_IPW3945 && config_ipw3945
+
 checkvalue $CONFIG_AUTOMOUNT && config_automount
 
 checkvalue $CONFIG_DISTCC && config_distcc
 
+checkvalue $CONFIG_DISTRI && config_distri
+
 checkvalue $CONFIG_BLANKING && config_blanking
 
 [ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||||||||">/dev/tty7
 
 checkvalue $CONFIG_GRML2HD && config_grml2hd
 
+checkvalue $CONFIG_DEBOOTSTRAP && config_debootstrap
+
 checkvalue $CONFIG_XSTARTUP && config_x_startup
 # }}}
 
@@ -249,7 +276,6 @@ if [ -z "$SPLASH" ] ; then
   stage=6
   rundebugshell
 fi
-# }}}
 
 if [ -n "$BOOTDEBUG" ] ; then
   CMDLINE="$(cat /proc/cmdline)"
@@ -257,6 +283,7 @@ if [ -n "$BOOTDEBUG" ] ; then
   einfo "Bootoption debug detected. Printing kernel command line:"
   echo "$CMDLINE"
 fi
+# }}}
 
 # {{{ Re-enable signals
 trap 2 3 11