[PC-BSD Commits] r176 - in pcbsd/trunk/system-overlay: PCBSD/Services/apm etc

[svn at pcbsd.org]

Author: kris
Date: 2007-04-17 18:43:13 +0100 (Tue, 17 Apr 2007)
New Revision: 176

Modified:
   pcbsd/trunk/system-overlay/PCBSD/Services/apm/disable.sh
   pcbsd/trunk/system-overlay/PCBSD/Services/apm/enable.sh
   pcbsd/trunk/system-overlay/PCBSD/Services/apm/isEnabled.sh
   pcbsd/trunk/system-overlay/PCBSD/Services/apm/service.cfg
   pcbsd/trunk/system-overlay/etc/rc.conf
Log:
Fixed APM support, disabled APM module, but enabled apmd anyway, since even without APM support, it allows the battery application to
work, and also fixes screensaver support. 

Modified: pcbsd/trunk/system-overlay/PCBSD/Services/apm/disable.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Services/apm/disable.sh	2007-04-15 08:07:01 UTC (rev 175)
+++ pcbsd/trunk/system-overlay/PCBSD/Services/apm/disable.sh	2007-04-17 17:43:13 UTC (rev 176)
@@ -2,12 +2,8 @@
 # This script disables the service at bootup
 # Return 0 on success, or 1 on failure. 
 
-cat /etc/rc.conf | grep -v "apm_enable=" | grep -v "apmd_enable=" >/tmp/rc.new
-echo "apm_enable=\"NO\"" >> /tmp/rc.new
+cat /etc/rc.conf | grep -v "apmd_enable=" >/tmp/rc.new
 echo "apmd_enable=\"NO\"" >> /tmp/rc.new
 mv /tmp/rc.new /etc/rc.conf
 
-cat /boot/loader.conf | grep -v "apm_load=" >/tmp/loader.new
-echo "apm_load=\"NO\"" >> /tmp/loader.new
-mv /tmp/loader.new /boot/loader.conf
 return 0

Modified: pcbsd/trunk/system-overlay/PCBSD/Services/apm/enable.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Services/apm/enable.sh	2007-04-15 08:07:01 UTC (rev 175)
+++ pcbsd/trunk/system-overlay/PCBSD/Services/apm/enable.sh	2007-04-17 17:43:13 UTC (rev 176)
@@ -2,13 +2,8 @@
 # This script enables the service at bootup
 # Return 0 on success, or 1 on failure. 
 
-cat /etc/rc.conf | grep -v "apm_enable=" | grep -v "apmd_enable=" >/tmp/rc.new
-echo "apm_enable=\"YES\"" >> /tmp/rc.new
+cat /etc/rc.conf | grep -v "apmd_enable=" >/tmp/rc.new
 echo "apmd_enable=\"YES\"" >> /tmp/rc.new
 mv /tmp/rc.new /etc/rc.conf
 
-cat /boot/loader.conf | grep -v "apm_load=" >/tmp/loader.new
-echo "apm_load=\"YES\"" >> /tmp/loader.new
-mv /tmp/loader.new /boot/loader.conf
-
 return 0

Modified: pcbsd/trunk/system-overlay/PCBSD/Services/apm/isEnabled.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Services/apm/isEnabled.sh	2007-04-15 08:07:01 UTC (rev 175)
+++ pcbsd/trunk/system-overlay/PCBSD/Services/apm/isEnabled.sh	2007-04-17 17:43:13 UTC (rev 176)
@@ -2,7 +2,7 @@
 # This script checks if a service is enabled to run at bootup
 # Return a "0" if service is enabled or a "1" if it is disabled
 
-grep 'apm_enable="YES"' /etc/rc.conf >/dev/null
+grep 'apmd_enable="YES"' /etc/rc.conf >/dev/null
 if [ "$?" = "0" ]
 then
  return 0

Modified: pcbsd/trunk/system-overlay/PCBSD/Services/apm/service.cfg
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Services/apm/service.cfg	2007-04-15 08:07:01 UTC (rev 175)
+++ pcbsd/trunk/system-overlay/PCBSD/Services/apm/service.cfg	2007-04-17 17:43:13 UTC (rev 176)
@@ -1,3 +1,3 @@
 # APM Service Config File
-name: APM (Advanced Power Management)
-description: Provides power management options
+name: APMD (Advanced Power Management Daemon)
+description: Provides support for KDE battery reporting

Modified: pcbsd/trunk/system-overlay/etc/rc.conf
===================================================================
--- pcbsd/trunk/system-overlay/etc/rc.conf	2007-04-15 08:07:01 UTC (rev 175)
+++ pcbsd/trunk/system-overlay/etc/rc.conf	2007-04-17 17:43:13 UTC (rev 176)
@@ -40,9 +40,8 @@
 # Denyhosts Startup 
 denyhosts_enable="YES" 
 
-# APM is outdated and used only for older computers. APM does not exist anymore.
-#apm_enable="YES"
-#apmd_enable="YES"
+# Enable the daemon only, for battery / screensaver support
+apmd_enable="YES"
 
 # powerd: adaptive speed while on AC power, adaptive while on battery power
 powerd_enable="YES"