Check for "none /sys sysfs" instead of sysfs only; Send output of acpid to $DEBUG...

[grml-autoconfig.git] / grml-autoconfig

diff --git a/grml-autoconfig b/grml-autoconfig
index 335244b..2369a3a 100755 (executable)
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -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
+      for i in rootfs "none /sys sysfs" proc /live/image /live/cow /lib/init/rw /dev/shm /dev/pts ; do
           grep $i /proc/mounts >> /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