packages: acpid/acpid.init, acpid/acpid.sysconfig - drop ospm_system (< 2.6...

[glen]

Author: glen                         Date: Tue Nov 17 21:00:51 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- drop ospm_system (< 2.6 kernel)

---- Files affected:
packages/acpid:
   acpid.init (1.25 -> 1.26) , acpid.sysconfig (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: packages/acpid/acpid.init
diff -u packages/acpid/acpid.init:1.25 packages/acpid/acpid.init:1.26
--- packages/acpid/acpid.init:1.25	Thu May 14 11:45:44 2009
+++ packages/acpid/acpid.init	Tue Nov 17 22:00:45 2009
@@ -31,9 +31,7 @@
 		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

================================================================
Index: packages/acpid/acpid.sysconfig
diff -u packages/acpid/acpid.sysconfig:1.9 packages/acpid/acpid.sysconfig:1.10
--- packages/acpid/acpid.sysconfig:1.9	Thu Oct 27 11:18:41 2005
+++ packages/acpid/acpid.sysconfig	Tue Nov 17 22:00:45 2009
@@ -1,14 +1,10 @@
-# Customized setings for acpid
+# Customized settings for acpid
 
 # Define nice level for acpid:
 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"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/acpid/acpid.init?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/acpid/acpid.sysconfig?r1=1.9&r2=1.10&f=u