Remove obsolete acpid/dbus dependency check
authorChristian Hofstaedtler <ch@grml.org>
Wed, 16 Nov 2011 09:53:10 +0000 (10:53 +0100)
committerChristian Hofstaedtler <ch@grml.org>
Wed, 16 Nov 2011 09:53:10 +0000 (10:53 +0100)
acpid and dbus apparently previously competed for /proc/acpi/events, but
this interface no longer even exists on current kernels.

autoconfig.functions

index c5fa8df..92468fb 100755 (executable)
@@ -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
       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
     else
       ewarn "acpi daemon already running."
       eend 0