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

diff --git a/grml-autoconfig b/grml-autoconfig
index 2c97dbc..f57a890 100755
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -53,17 +53,11 @@ mount_pts
 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
 checkvalue $CONFIG_DEBUG && config_debug
 
 SPLASH=''
-if checkbootparam "textsplash" || checkbootparam "tsplash"; then
+if checkbootparam 'textsplash' || checkbootparam 'tsplash'; then
    SPLASH=1
 fi
 
@@ -91,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
@@ -206,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
@@ -258,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