X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=grml-autoconfig;h=efe0061b59082739936448849064803e88d441f8;hp=8b63ea1062655311e5ac61f67f96326e9ffd26f9;hb=37eee4a042ff38046cb7594420a03af5067efa8d;hpb=b699975d7e2d809c1c19a818d14040ba0f58fa44

diff --git a/grml-autoconfig b/grml-autoconfig
index 8b63ea1..efe0061 100755
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Sam Nov 03 17:22:09 CET 2007 [mika]
 ################################################################################
 
 # http://wiki.debian.org/LSBInitScripts =>
@@ -77,16 +76,16 @@ if [ -z "$INSTALLED" -a -e /live/cow ] ; then
 fi
 
 if [ -z "$SPLASH" ] ; then
-  stage=5
-  rundebugshell
+   stage=5
+   rundebugshell
 fi
 
 if [ -z "$BOOTDEBUG" ] ; then
-  einfo "Setting kernel ring buffer to level 2."
-  echo "2" > /proc/sys/kernel/printk ; eend $?
+   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 $?
+   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
@@ -111,6 +110,8 @@ checkvalue $CONFIG_LOG && config_log
 
 checkvalue $CONFIG_SWSPEAK && config_swspeak
 
+checkvalue $CONFIG_HWSPEAK && config_hwspeak
+
 checkvalue $CONFIG_FWTIMEOUT && config_fwtimeout
 
 checkvalue $CONFIG_FIX_PASSWD && config_fix_passwd
@@ -176,10 +177,6 @@ checkvalue $CONFIG_ACPI_APM && config_acpi_apm
 
 checkvalue $CONFIG_PCMCIA && config_pcmcia
 
-# {{{ Read in what hwsetup has found
-[ -f /etc/sysconfig/grml ] && . /etc/sysconfig/grml
-# }}}
-
 checkvalue $CONFIG_KEYBOARD && config_keyboard
 
 [ -n "$SPLASH" ] &&  /usr/bin/grml-bootsplash "||||||">/dev/tty14
@@ -190,8 +187,6 @@ checkvalue $CONFIG_INTERACTIVE && config_interactive
 
 checkvalue $CONFIG_AGP && config_agp
 
-[ -f /etc/sysconfig/grml ] && . /etc/sysconfig/grml
-
 checkvalue $CONFIG_AUTOMOUNTER && config_automounter
 
 checkvalue $CONFIG_DMA && config_dma
@@ -268,6 +263,8 @@ checkvalue $CONFIG_IPW3945 && config_ipw3945
 
 checkvalue $CONFIG_AUTOMOUNT && config_automount
 
+checkvalue $CONFIG_MYPATH && config_mypath
+
 checkvalue $CONFIG_DISTCC && config_distcc
 
 checkvalue $CONFIG_DISTRI && config_distri
@@ -279,6 +276,8 @@ if [ -n "$SPLASH" ] ; then
    chvt 1
 fi
 
+checkvalue $CONFIG_TOHD && config_tohd
+
 checkvalue $CONFIG_GRML2HD && config_grml2hd
 
 checkvalue $CONFIG_DEBOOTSTRAP && config_debootstrap
@@ -288,15 +287,15 @@ checkvalue $CONFIG_XSTARTUP && config_x_startup
 
 # {{{ debug
 if [ -z "$SPLASH" ] ; then
-  stage=6
-  rundebugshell
+   stage=6
+   rundebugshell
 fi
 
 if [ -n "$BOOTDEBUG" ] ; then
-  CMDLINE="$(cat /proc/cmdline)"
-  [ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/*)"
-  einfo "Bootoption debug detected. Printing kernel command line:"
-  echo "$CMDLINE"
+   CMDLINE="$(cat /proc/cmdline)"
+   [ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/*)"
+   einfo "Bootoption debug detected. Printing kernel command line:"
+   echo "$CMDLINE"
 fi
 # }}}