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
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
checkvalue $CONFIG_SSH && config_ssh
+checkvalue $CONFIG_VNC && config_vnc
+
checkvalue $CONFIG_PASSWD && config_passwd
checkvalue $CONFIG_EXTRACT && config_extract
checkvalue $CONFIG_DEBS && config_debs
-checkvalue $CONFIG_SCRIPTS && config_scripts
-
checkvalue $CONFIG_CONFIG && config_config
+checkvalue $CONFIG_SCRIPTS && config_scripts
+
checkvalue $CONFIG_PARTCONF && config_partconf
[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||">/dev/tty14
checkvalue $CONFIG_NETCONFIG && config_netconfig
+checkvalue $CONFIG_NETSCRIPT && config_netscript
+
checkvalue $CONFIG_NETIPV6 && config_ipv6
checkvalue $CONFIG_DEBNET && config_debnet
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