X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=grml-autoconfig;h=27b40b08a51e532a86ca9c235dc13ea51fe1625b;hp=7e46b47f85920945f5fe518c015d0f7b9803daaa;hb=c0b865840237abd8d8865147190f9af2a2cac057;hpb=73ba2ea4706132edb816e3c1b15f5b83ffeee38d

diff --git a/grml-autoconfig b/grml-autoconfig
index 7e46b47..27b40b0 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:
@@ -57,7 +57,7 @@ mount_sys
 checkvalue $CONFIG_DEBUG && config_debug
 
 SPLASH=''
-if checkbootparam "textsplash" || checkbootparam "tsplash"; then
+if checkbootparam 'textsplash' || checkbootparam 'tsplash'; then
    SPLASH=1
 fi
 
@@ -85,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
@@ -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,34 +178,30 @@ 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
 
-checkvalue $CONFIG_CDROM_SCRIPTS && config_cdrom_scripts
-
 # device symlinks {{{
   [ -r /mnt/floppy ] || mkdir /mnt/floppy
   [ -r /mnt/cdrom ]  || mkdir /mnt/cdrom
@@ -234,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
@@ -250,12 +240,8 @@ 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
@@ -285,9 +271,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