X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=grml-autoconfig;h=83cb54fa4af3b6552e6cabb86ac587970de25d3e;hp=04625a93abd65e2f43c354485096deef4e4cc9a6;hb=34aa2a2ab415ddb372b9f3d9ad68a0467f270621;hpb=f44d17af4512efef4f192722a2295ac401252074

diff --git a/grml-autoconfig b/grml-autoconfig
index 04625a9..83cb54f 100755
--- 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: Mit Jul 25 19:59:07 CEST 2007 [mika]
+# Latest change: Sam Nov 03 17:22:09 CET 2007 [mika]
 ################################################################################
 
 # http://wiki.debian.org/LSBInitScripts =>
@@ -67,6 +67,15 @@ if checkbootparam "textsplash" || checkbootparam "tsplash"; then
    SPLASH=1
 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 "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
+
 if [ -z "$SPLASH" ] ; then
   stage=5
   rundebugshell
@@ -80,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!"
@@ -165,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
@@ -179,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
@@ -193,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