X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=grml-autoconfig;h=8b63ea1062655311e5ac61f67f96326e9ffd26f9;hp=335244b29c20556a3b6bd779614cb54b3af77e2e;hb=b699975d7e2d809c1c19a818d14040ba0f58fa44;hpb=f4e274b64189cf0e000bcf71f9ce098ebce9cdea

diff --git a/grml-autoconfig b/grml-autoconfig
index 335244b..8b63ea1 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: 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,21 +70,12 @@ 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
 
-# make sure /etc/resolv.conf points to /dev/shm/resolvconf
-# and /dev/shm/resolvconf exists:
-if [ -z "$INSTALLED" ] && ! [ -d /dev/shm/resolvconf ] ; then
-   if [[ $(readlink /etc/resolv.conf) == /etc/resolvconf/run/resolv.conf ]] && \
-      [[ $(readlink /etc/resolvconf/run) == /dev/shm/resolvconf ]] ; then
-      mkdir /dev/shm/resolvconf
-   fi
-fi
-
 if [ -z "$SPLASH" ] ; then
   stage=5
   rundebugshell
@@ -98,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!"
@@ -211,8 +204,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