X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=grml-autoconfig;h=a0d4a4c2ff5e36b3457b50dcdb98c58c331c836e;hp=08c5edd3f507c12fff27c6da1de186d1a80ac02a;hb=f9648a366334e91a4724b861913e6fa17521db4f;hpb=626a0f8f65d3de4e055f9ff70fc6b463b558ac45 diff --git a/grml-autoconfig b/grml-autoconfig index 08c5edd..a0d4a4c 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 @@ -100,9 +87,6 @@ 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 @@ -162,21 +146,6 @@ 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 -# }}} - # {{{ Re-enable signals trap 2 3 11 # }}}