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

diff --git a/autoconfig.functions b/autoconfig.functions
index e7a827a..c6ab133 100755 (executable)
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Klaus Knopper <knopper@knopper.net>, (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Don Sep 06 23:57:02 CEST 2007 [mika]
+# Latest change: Don Sep 20 15:31:56 CEST 2007 [mika]
 ################################################################################
 
 # {{{ path, variables, signals, umask, zsh
@@ -751,7 +751,7 @@ if [ -d /proc/acpi ]; then
     if ! [ -S /var/run/acpid.socket ] ; then
       if ! [ -r /var/run/dbus/pid ] ; then
         einfo "Starting acpi daemon."
-        /etc/init.d/acpid start >>$DEBUG ; eend $?
+        /etc/init.d/acpid start 2>&1 1>>$DEBUG | logger ; eend $?
       else
         eerror "acpid error: it seems you are running d-bus/hal, but acpid needs to be started before d-bus."
         eerror "Solution: please activate acpid via /etc/runlevel.conf"

diff --git a/debian/changelog b/debian/changelog
index 05b11c8..624598c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+grml-autoconfig (0.7.22) unstable; urgency=low
+
+  * Check for "none /sys sysfs" instead of sysfs only. This should
+    fix duplicate output inside /etc/mtab.
+  * Send output of acpid to $DEBUG and logger.
+
+ -- Michael Prokop <mika@grml.org>  Thu, 20 Sep 2007 16:05:50 +0200
+
 grml-autoconfig (0.7.21) unstable; urgency=low
 
   * And finally get rid of the /dev/shm/resolvconf workaround again.

diff --git a/grml-autoconfig b/grml-autoconfig
index 68961f2..2369a3a 100755 (executable)
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -70,7 +70,7 @@ 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