- load button module (in 2.6 kernels), proper detection if module should be

  loaded (/proc/acpi/button directory - /proc/acpi/event is present anyway)

Changed files:
    acpid.init -> 1.12
    acpid.sysconfig -> 1.3

diff --git a/acpid.init b/acpid.init
index eefcad386dced0a15df1d95132269221b3db732d..f8512d447ca9c64d4b67273fec8263f9da7de769 100644 (file)
--- a/acpid.init
+++ b/acpid.init
@@ -21,8 +21,9 @@ case "$1" in
   start)
        # Start daemons.
        if [ ! -f /var/lock/subsys/acpid ]; then
-               if [ ! -f /proc/acpi/event ]; then
-                       _modprobe single ospm_button
+               if [ ! -d /proc/acpi/button ]; then
+                       _modprobe ospm_button
+                       _modprobe button
                fi
                if is_yes "$MODPROBE_OSPM_SYSTEM"; then
                        _modprobe single ospm_system

diff --git a/acpid.sysconfig b/acpid.sysconfig
index aee646ed00157408ddea8a2a1ef5c4efa508e168..2b83bbdaa8b696876570330dac3d79a53b1c0e45 100644 (file)
--- a/acpid.sysconfig
+++ b/acpid.sysconfig
@@ -6,5 +6,6 @@ SERVICE_RUN_NICE_LEVEL="+0"
 # Program arguments:
 PROGRAM_ARGS=""
 
-# Run modprobe ospm_system on startup
+# Run modprobe ospm_system (not present in 2.6 kernels) to allow
+# smooth system shutdown
 MODPROBE_OSPM_SYSTEM="yes"