X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=grml-autoconfig;h=a1c260e8c36c0ee3aea165de6f6ee6c1add3a544;hp=f57a890e19830e81803a8c6a6cc3beca199340e8;hb=27914b00e672a70311c89e2c462c83ef11c4da3b;hpb=411752d77a5a9f7d795653a33434c121094f6aee

diff --git a/grml-autoconfig b/grml-autoconfig
index f57a890..a1c260e 100755
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -135,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
@@ -194,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
@@ -204,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
@@ -232,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
@@ -283,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