X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=autoconfig.functions;h=c6ab133dd78dbf8754b839c1fb34404bed3bed89;hb=09f3e8f58c82ab3d1e6c7722e431ce51cd59ad2a;hp=f4cb8fc106ef9dd319f11c7ff663adaedbd4b844;hpb=bff0d22e5765c0b8f146ede7311bb55fb26d4aaa;p=grml-autoconfig.git

diff --git a/autoconfig.functions b/autoconfig.functions
index f4cb8fc..c6ab133 100755
--- 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"
@@ -2106,7 +2106,8 @@ config_lvm(){
   if checkbootparam 'nolvm' ; then
      ewarn "Skipping LVM code as requested on boot commandline." ; eend 0
   else
-    if ! [ -x /sbin/lvm -a -x /etc/init.d/lvm2 -a -x /sbin/lvdisplay ] ; then
+    # Debian etch provides /etc/init.d/lvm only, newer suites provide /etc/init.d/lvm2
+    if ! [ -x /sbin/lvm -a -x /sbin/lvdisplay ] || ! [ -x /etc/init.d/lvm2 -o -x /etc/init.d/lvm ] ; then
        eerror "LVM not available, can not execute it." ; eend 1
     else
        if lvdisplay 2>&1 | grep -v 'No volume groups found' 1>/dev/null 2>&1 ; then