X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=grml-autoconfig;h=f2a5524352c94a0f004b21db5ff9a604c48f2af0;hp=8c7961703e7a2618a866e05cbfa7eebeed90294d;hb=8ae37ab733a40aa3d76400cee6f836305ca7ccec;hpb=b04d499bbcaaebb4167def16ac650ed27355fef8

diff --git a/grml-autoconfig b/grml-autoconfig
index 8c79617..f2a5524 100755
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -4,14 +4,13 @@
 # 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: Son Jän 20 19:44:11 CET 2008 [mika]
 ################################################################################
 
 # 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:
@@ -54,16 +53,11 @@ mount_pts
 mount_sys
 # }}}
 
-# {{{ Read in boot parameters
-CMDLINE="$(cat /proc/cmdline)"
-[ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/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,13 +85,9 @@ fi
 
 checkvalue $CONFIG_SYSLOG && config_syslog
 
-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
+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
 
 if [ -n "$SPLASH" ] ; then
@@ -111,6 +101,8 @@ checkvalue $CONFIG_LOG && config_log
 
 checkvalue $CONFIG_SWSPEAK && config_swspeak
 
+checkvalue $CONFIG_HWSPEAK && config_hwspeak
+
 checkvalue $CONFIG_FWTIMEOUT && config_fwtimeout
 
 checkvalue $CONFIG_FIX_PASSWD && config_fix_passwd
@@ -143,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
@@ -202,21 +196,25 @@ 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_MYCONFIG && config_myconfig
+checkvalue $CONFIG_FINDDCSDIR && config_finddcsdir
 
 checkvalue $CONFIG_DEBS && config_debs
 
+checkvalue $CONFIG_CONFIG && config_config
+
 checkvalue $CONFIG_SCRIPTS && config_scripts
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||">/dev/tty14
+checkvalue $CONFIG_PARTCONF && config_partconf
 
-checkvalue $CONFIG_CDROM_SCRIPTS && config_cdrom_scripts
+[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||">/dev/tty14
 
 # device symlinks {{{
   [ -r /mnt/floppy ] || mkdir /mnt/floppy
@@ -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
@@ -258,9 +258,7 @@ 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_MYPATH && config_mypath
 
 checkvalue $CONFIG_DISTCC && config_distcc
 
@@ -273,6 +271,8 @@ if [ -n "$SPLASH" ] ; then
    chvt 1
 fi
 
+checkvalue $CONFIG_TOHD && config_tohd
+
 checkvalue $CONFIG_GRML2HD && config_grml2hd
 
 checkvalue $CONFIG_DEBOOTSTRAP && config_debootstrap
@@ -287,8 +287,12 @@ if [ -z "$SPLASH" ] ; then
 fi
 
 if [ -n "$BOOTDEBUG" ] ; then
-   CMDLINE="$(cat /proc/cmdline)"
-   [ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/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