- drop ospm_system (< 2.6 kernel)

Changed files:
    acpid.init -> 1.26
    acpid.sysconfig -> 1.10

diff --git a/acpid.init b/acpid.init
index b6e15b4914e7f471fad5953a91de31e06370068d..30636fd121e1880972748fd4cf2ec923310daaa7 100644 (file)
--- a/acpid.init
+++ b/acpid.init
@@ -31,9 +31,7 @@ start() {
                modprobe -s ospm_button
                modprobe -s button
        fi
-       if [ "$(kernelverser)" -lt "002006" ] && is_yes "$MODPROBE_OSPM_SYSTEM"; then
-               modprobe -s ospm_system
-       fi
+
        # Load additional modules:
        if [ -n "$LAPTOP_MODULES" ]; then
                for i in $LAPTOP_MODULES; do

diff --git a/acpid.sysconfig b/acpid.sysconfig
index 2a3ff3009733ae451f80969cd26ac48a061c39a5..e47a1cc461794423ccefe063cb513c705b12f5c1 100644 (file)
--- a/acpid.sysconfig
+++ b/acpid.sysconfig
@@ -1,4 +1,4 @@
-# Customized setings for acpid
+# Customized settings for acpid
 
 # Define nice level for acpid:
 SERVICE_RUN_NICE_LEVEL="+0"
@@ -6,10 +6,6 @@ SERVICE_RUN_NICE_LEVEL="+0"
 # Program arguments:
 PROGRAM_ARGS=""
 
-# Run modprobe ospm_system (not present in 2.6 kernels) to allow
-# smooth system shutdown
-#MODPROBE_OSPM_SYSTEM="yes"
-
 # These modules are needed on laptops.
 #LAPTOP_MODULES="ac battery"