X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=grml-autoconfig;h=6e71b4d868dd6d1f97822b3a9761db97b0857bdf;hp=b98c747f75100f04d78e11d87be393d80781edc4;hb=HEAD;hpb=0fb27baedd40895f6ab82017c3a3e137ee488955

diff --git a/grml-autoconfig b/grml-autoconfig
index b98c747..dedb9a8 100755
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -54,25 +54,12 @@ mount_sys
 # }}}
 
 # {{{ main grml-autoconfig
-checkvalue $CONFIG_DEBUG && config_debug
-
 # make sure symlink /etc/mtab exists, this is usually handled by
 # /etc/init.d/checkroot.sh but we don't execute this script on the live system
 if [ -z "$INSTALLED" ] ; then
   ln -sf /proc/mounts /etc/mtab
 fi
 
-stage=5
-rundebugshell
-
-if [ -z "$BOOTDEBUG" ] ; then
-   einfo "Setting kernel ring buffer to level 2."
-   echo "2" > /proc/sys/kernel/printk ; eend $?
-else
-   einfo "Setting kernel ring buffer to level 6. Adjust manually via running dmesg -n \$VALUE."
-   echo "6" > /proc/sys/kernel/printk ; eend $?
-fi
-
 checkvalue $CONFIG_SYSLOG && config_syslog
 
 if checkbootparam 'forensic' ; then
@@ -90,17 +77,14 @@ checkvalue $CONFIG_TIME && config_time
 
 checkvalue $CONFIG_KERNEL &&  config_kernel
 
+checkvalue $CONFIG_SECUREBOOT && config_secureboot
+
 checkvalue $CONFIG_TIMEZONE && config_timezone
 
 checkvalue $CONFIG_SWRAID && config_swraid
 
-checkvalue $CONFIG_DMRAID && config_dmraid
-
 checkvalue $CONFIG_LVM && config_lvm
 
-# No kernel messages while probing modules
-echo "0" > /proc/sys/kernel/printk
-
 checkvalue $CONFIG_TESTCD && config_testcd
 
 checkvalue $CONFIG_BRLTTY && config_brltty
@@ -133,6 +117,8 @@ checkvalue $CONFIG_PARTCONF && config_partconf
 
 checkvalue $CONFIG_MIXER && config_mixer
 
+checkvalue $CONFIG_GPM && config_gpm
+
 checkvalue $CONFIG_SERVICES && config_services
 
 checkvalue $CONFIG_DEBNET && config_debnet
@@ -143,12 +129,12 @@ checkvalue $CONFIG_NETCONFIG && config_netconfig
 
 checkvalue $CONFIG_NETSCRIPT && config_netscript
 
-checkvalue $CONFIG_STATS && config_stats
-
 checkvalue $CONFIG_CONSOLE && config_console
 
 checkvalue $CONFIG_VIRTUALBOX_SHARED_FOLDERS && config_virtualbox_shared_folders
 
+checkvalue $CONFIG_VIRTUALBOX_SETUP && config_virtualbox_setup
+
 checkvalue $CONFIG_MYPATH && config_mypath
 
 checkvalue $CONFIG_DISTRI && config_distri
@@ -158,21 +144,8 @@ checkvalue $CONFIG_BLANKING && config_blanking
 checkvalue $CONFIG_DEBOOTSTRAP && config_debootstrap
 
 checkvalue $CONFIG_XSTARTUP && config_x_startup
-# }}}
 
-# {{{ debug
-stage=6
-rundebugshell
-
-if [ -n "$BOOTDEBUG" ] ; then
-   # set only if not already set
-   if [ -z "$CMDLINE" ] ; then
-     CMDLINE="$(cat /proc/cmdline)"
-     [ -d ${LIVECD_PATH}/bootparams/ ] && CMDLINE="$CMDLINE $(cat ${LIVECD_PATH}/bootparams/*)"
-   fi
-   einfo "Bootoption debug detected. Printing kernel command line:"
-   echo "$CMDLINE"
-fi
+checkvalue $CONFIG_EASTEREGG && config_easteregg
 # }}}
 
 # {{{ Re-enable signals