X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=8fa87a9daf4658d22a1c797dc88401a4cc4160d3;hp=c5fa8df7db8a1eb0f854f771c9f20dc8592f2366;hb=2144a3a7d7a98359cb9133facb8f0261744afeac;hpb=4e88b7a5a0432e9b7f0e09bf25e20c2d623d21a1

diff --git a/autoconfig.functions b/autoconfig.functions
index c5fa8df..8fa87a9 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -695,11 +695,11 @@ fi
 config_acpi_apm(){
 if [ -d /proc/acpi ]; then
   if checkbootparam 'noacpi'; then
-    ewarn "Skipping ACPI Bios detection as requested via noacpi on boot commandline." ; eend 0
+    ewarn "ACPI: Not loading modules as requested by boot option \"noacpi\"." ; eend 0
   elif checkbootparam 'nogrmlacpi' ; then
-    ewarn "Skipping ACPI Bios detection as requested via nogrmlacpi on boot commandline." ; eend 0
+    ewarn "ACPI: Not loading modules as requested by boot option \"nogrmlacpi\"." ; eend 0
   else
-    einfo "ACPI Bios found, activating modules (disable via bootoption noacpi / nogrmlacpi): "
+    einfo "ACPI: Loading modules (disable with boot option noacpi / nogrmlacpi): "
     eindent
     found=""
     for a in /lib/modules/$KERNEL/kernel/drivers/acpi/*; do
@@ -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