From: Christian Hofstaedtler <ch@grml.org>
Date: Wed, 16 Nov 2011 09:53:10 +0000 (+0100)
Subject: Remove obsolete acpid/dbus dependency check
X-Git-Tag: v0.9.34~15
X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=65fdd0026f6af2d592c2baa2d8e76fc04cdd2d09

Remove obsolete acpid/dbus dependency check

acpid and dbus apparently previously competed for /proc/acpi/events, but
this interface no longer even exists on current kernels.
---

diff --git a/autoconfig.functions b/autoconfig.functions
index c5fa8df..92468fb 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -717,14 +717,8 @@ if [ -d /proc/acpi ]; then
       ewarn "(none)" ; eend 1
     fi
     if ! ps x 2>>$DEBUG | grep -q /usr/sbin/acpid ; then
-      if ! [ -r /var/run/dbus/pid ] ; then
-        einfo "Starting acpi daemon."
-        /etc/init.d/acpid start >>$DEBUG 2>&1 ; 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"
-        eend 1
-      fi
+      einfo "Starting acpi daemon."
+      /etc/init.d/acpid start >>$DEBUG 2>&1 ; eend $?
     else
       ewarn "acpi daemon already running."
       eend 0