Drop unused update_progress() + /etc/sysconfig/grml

[grml-autoconfig.git] / grml-autoconfig

diff --git a/grml-autoconfig b/grml-autoconfig
index 68961f2..83cb54f 100755 (executable)
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -4,7 +4,7 @@
 # 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: Mon Sep 17 17:39:29 CEST 2007 [mika]
+# Latest change: Sam Nov 03 17:22:09 CET 2007 [mika]
 ################################################################################
 
 # http://wiki.debian.org/LSBInitScripts =>
@@ -70,8 +70,8 @@ fi
 # update /etc/mtab if running in live-initramfs mode:
 if [ -z "$INSTALLED" -a -e /live/cow ] ; then
    if ! grep -q rootfs /etc/mtab ; then
-      for i in rootfs sysfs proc /live/image /live/cow /lib/init/rw /dev/shm /dev/pts ; do
-          grep $i /proc/mounts >> /etc/mtab
+      for i in rootfs "none /sys sysfs" proc /live/image /live/cow /lib/init/rw /dev/shm /dev/pts ; do
+          grep $i /proc/mounts | grep -v /dev/.static >> /etc/mtab
       done
    fi
 fi
@@ -89,6 +89,8 @@ else
   echo "6" > /proc/sys/kernel/printk ; eend $?
 fi
 
+checkvalue $CONFIG_SYSLOG && config_syslog
+
 if checkbootparam "forensic" ; then
    eerror "Bootopion forensic found. Important notice!"
    eerror " Do *not* boot with something like 'grml forensic ...' but with 'forensic ...' instead!"
@@ -174,10 +176,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
@@ -188,8 +186,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
@@ -202,8 +198,6 @@ checkvalue $CONFIG_DHCP && config_dhcp
 
 [ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||||">/dev/tty14
 
-checkvalue $CONFIG_SYSLOG && config_syslog
-
 checkvalue $CONFIG_CPU && config_cpu
 
 checkvalue $CONFIG_SSH && config_ssh