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

diff --git a/grml-autoconfig b/grml-autoconfig
index f57a890..d19c184 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:
@@ -117,10 +117,6 @@ checkvalue $CONFIG_TIME && config_time
 
 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
@@ -131,10 +127,10 @@ checkvalue $CONFIG_FAST && config_fast
 
 [ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||">/dev/tty14
 
-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
@@ -168,14 +164,10 @@ checkvalue $CONFIG_ACPI_APM && config_acpi_apm
 
 checkvalue $CONFIG_PCMCIA && config_pcmcia
 
-checkvalue $CONFIG_KEYBOARD && config_keyboard
-
 [ -n "$SPLASH" ] &&  /usr/bin/grml-bootsplash "||||||">/dev/tty14
 
 checkvalue $CONFIG_BLIND && config_blind
 
-checkvalue $CONFIG_INTERACTIVE && config_interactive
-
 checkvalue $CONFIG_AGP && config_agp
 
 checkvalue $CONFIG_AUTOMOUNTER && config_automounter
@@ -186,28 +178,26 @@ checkvalue $CONFIG_FSTAB && config_fstab
 
 checkvalue $CONFIG_MOUSE && config_mouse
 
-checkvalue $CONFIG_DHCP && config_dhcp
-
 [ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||||">/dev/tty14
 
 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
 
-checkvalue $CONFIG_HOMEDIR && config_homedir
-
 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 +222,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
@@ -240,20 +232,14 @@ checkvalue $CONFIG_DEBNET && config_debnet
 
 checkvalue $CONFIG_CONSOLE && config_console
 
-checkvalue $CONFIG_SETKEYCODES && config_setkeycodes
-
 checkvalue $CONFIG_BLINDSOUND && config_blindsound
 
 checkvalue $CONFIG_WELCOME && config_welcome
 
 checkvalue $CONFIG_FIX_UNIONFS && fix_unionfs
 
-checkvalue $CONFIG_CREATE_MNT_DIRS && create_mnt_dirs
-
 checkvalue $CONFIG_915RESOLUTION && config_915resolution
 
-checkvalue $CONFIG_IPW3945 && config_ipw3945
-
 checkvalue $CONFIG_MYPATH && config_mypath
 
 checkvalue $CONFIG_DISTCC && config_distcc
@@ -283,9 +269,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