X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=grml-autoconfig;h=c50062a08eca3b3928f15a5ae03fd0863f4b74e9;hp=176a04b4b467e07def5ece480b3e240d604f49b3;hb=3673e2afc2792a303e34b1dfec95dd3a868fccce;hpb=bc6656c8a62d5b89aad347ebed4c81cc14e8cbdd

diff --git a/grml-autoconfig b/grml-autoconfig
index 176a04b..c50062a 100755
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -9,8 +9,8 @@
 # http://wiki.debian.org/LSBInitScripts =>
 ### BEGIN INIT INFO
 # Provides:          grml-autoconfig
-# Required-Start:
-# Required-Stop:
+# Required-Start:    $remote_fs
+# Required-Stop:     $remote_fs
 # Should-Start:      udev
 # Default-Start:     S 2 3 4 5
 # Default-Stop:
@@ -53,17 +53,11 @@ mount_pts
 mount_sys
 # }}}
 
-# {{{ Read in boot parameters
-CMDLINE="$(cat /proc/cmdline)"
-[ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/* | tr '\n' ' ')"
-[ -d /live/image/bootparams/ ] && CMDLINE="$CMDLINE $(cat /live/image/bootparams/* | tr '\n' ' ')"
-# }}}
-
 # {{{ main grml-autoconfig
 checkvalue $CONFIG_DEBUG && config_debug
 
 SPLASH=''
-if checkbootparam "textsplash" || checkbootparam "tsplash"; then
+if checkbootparam 'textsplash' || checkbootparam 'tsplash'; then
    SPLASH=1
 fi
 
@@ -91,7 +85,7 @@ fi
 
 checkvalue $CONFIG_SYSLOG && config_syslog
 
-if checkbootparam "forensic" ; then
+if checkbootparam 'forensic' ; then
    ewarn "Bootopion forensic found. Important notice:" ; eend 0
    ewarn " Do *NOT* boot with something like 'grml forensic ...' but always use 'forensic ...' instead!" ; eend 0
 fi
@@ -141,6 +135,8 @@ checkvalue $CONFIG_ENVIRONMENT && config_environment
 
 checkvalue $CONFIG_SWRAID && config_swraid
 
+checkvalue $CONFIG_DMRAID && config_dmraid
+
 checkvalue $CONFIG_LVM && config_lvm
 
 # No kernel messages while probing modules
@@ -200,6 +196,8 @@ checkvalue $CONFIG_CPU && config_cpu
 
 checkvalue $CONFIG_SSH && config_ssh
 
+checkvalue $CONFIG_VNC && config_vnc
+
 checkvalue $CONFIG_PASSWD && config_passwd
 
 checkvalue $CONFIG_EXTRACT  && config_extract
@@ -210,10 +208,10 @@ checkvalue $CONFIG_FINDDCSDIR && config_finddcsdir
 
 checkvalue $CONFIG_DEBS && config_debs
 
-checkvalue $CONFIG_SCRIPTS && config_scripts
-
 checkvalue $CONFIG_CONFIG && config_config
 
+checkvalue $CONFIG_SCRIPTS && config_scripts
+
 checkvalue $CONFIG_PARTCONF && config_partconf
 
 [ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||">/dev/tty14
@@ -238,6 +236,8 @@ checkvalue $CONFIG_SERVICES && config_services
 
 checkvalue $CONFIG_NETCONFIG && config_netconfig
 
+checkvalue $CONFIG_NETSCRIPT && config_netscript
+
 checkvalue $CONFIG_NETIPV6 && config_ipv6
 
 checkvalue $CONFIG_DEBNET && config_debnet
@@ -289,9 +289,12 @@ if [ -z "$SPLASH" ] ; then
 fi
 
 if [ -n "$BOOTDEBUG" ] ; then
-   CMDLINE="$(cat /proc/cmdline)"
-   [ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/*)"
-   [ -d /live/image/bootparams/ ] && CMDLINE="$CMDLINE $(cat /live/image/bootparams/*)"
+   # set only if not already set
+   if [ -z "$CMDLINE" ] ; then
+     CMDLINE="$(cat /proc/cmdline)"
+     [ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/*)"
+     [ -d /live/image/bootparams/ ] && CMDLINE="$CMDLINE $(cat /live/image/bootparams/*)"
+   fi
    einfo "Bootoption debug detected. Printing kernel command line:"
    echo "$CMDLINE"
 fi