X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=grml-autoconfig;h=a53d2c55c2607e5004c9a902c29daf515135623f;hp=92dd4145dfb83eba19982f6af2dfa89bb6c329e7;hb=412e05688d8d870932c8c00eb8f414e9d159dbdf;hpb=8328ba1e87429b4bdff9c7a686ea39c5c6a0d048

diff --git a/grml-autoconfig b/grml-autoconfig
index 92dd414..a53d2c5 100755
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -53,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
 
@@ -90,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
@@ -209,15 +200,17 @@ 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_SCRIPTS && config_scripts
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||">/dev/tty14
+checkvalue $CONFIG_CONFIG && config_config
 
-checkvalue $CONFIG_CDROM_SCRIPTS && config_cdrom_scripts
+checkvalue $CONFIG_PARTCONF && config_partconf
+
+[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||">/dev/tty14
 
 # device symlinks {{{
   [ -r /mnt/floppy ] || mkdir /mnt/floppy
@@ -261,8 +254,6 @@ 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
@@ -276,6 +267,8 @@ if [ -n "$SPLASH" ] ; then
    chvt 1
 fi
 
+checkvalue $CONFIG_TOHD && config_tohd
+
 checkvalue $CONFIG_GRML2HD && config_grml2hd
 
 checkvalue $CONFIG_DEBOOTSTRAP && config_debootstrap
@@ -290,8 +283,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