Load Lat15-Terminus16 console font if no framebuffer is available.

[grml-autoconfig.git] / grml-autoconfig

diff --git a/grml-autoconfig b/grml-autoconfig
index 7d7b3ac..b5556d1 100755 (executable)
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -53,12 +53,6 @@ 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
 
@@ -238,6 +232,8 @@ checkvalue $CONFIG_SERVICES && config_services
 
 checkvalue $CONFIG_NETCONFIG && config_netconfig
 
+checkvalue $CONFIG_NETSCRIPT && config_netscript
+
 checkvalue $CONFIG_NETIPV6 && config_ipv6
 
 checkvalue $CONFIG_DEBNET && config_debnet
@@ -289,9 +285,12 @@ if [ -z "$SPLASH" ] ; then
 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/*)"
+   # 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