Drop support for /etc/grml/autoconfig.small; support /live/image/bootparams/ again

[grml-autoconfig.git] / grml-autoconfig

diff --git a/grml-autoconfig b/grml-autoconfig
index 8c69443..2c97dbc 100755 (executable)
--- 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
@@ -290,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