streamline calls of bootparams-functions, single quotes everywhere

[grml-autoconfig.git] / grml-autoconfig

diff --git a/grml-autoconfig b/grml-autoconfig
index 7e46b47..7d7b3ac 100755 (executable)
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -53,11 +53,17 @@ 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
 
@@ -85,7 +91,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
@@ -212,8 +218,6 @@ 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