X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=grml-autoconfig;h=176a04b4b467e07def5ece480b3e240d604f49b3;hp=efe0061b59082739936448849064803e88d441f8;hb=125c37336b5ace85eceffb05e45ce858c12047cd;hpb=37eee4a042ff38046cb7594420a03af5067efa8d

diff --git a/grml-autoconfig b/grml-autoconfig
index efe0061..176a04b 100755
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -56,6 +56,7 @@ mount_sys
 # {{{ Read in boot parameters
 CMDLINE="$(cat /proc/cmdline)"
 [ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/* | tr '\n' ' ')"
+[ -d /live/image/bootparams/ ] && CMDLINE="$CMDLINE $(cat /live/image/bootparams/* | tr '\n' ' ')"
 # }}}
 
 # {{{ main grml-autoconfig
@@ -91,12 +92,8 @@ 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
+   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 +206,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 +260,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
@@ -294,6 +291,7 @@ 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/*)"
    einfo "Bootoption debug detected. Printing kernel command line:"
    echo "$CMDLINE"
 fi