acpid: use acpid for powerbutton shutdown.

diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index 3b384c829d0116c537cd97fe0c8a154001bfbe06..8092a162d3824e53acae40f15432b07861a5aed7 100644 (file)
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -3,7 +3,7 @@
 etc/rc.d/helper/getdnsfromdhcpc.pl
 etc/rc.d/helper/writeipac.pl
 #etc/rc.d/init.d
-#etc/rc.d/init.d/acpid
+etc/rc.d/init.d/acpid
 #etc/rc.d/init.d/alsa
 #etc/rc.d/init.d/amavisd
 etc/rc.d/init.d/apache

diff --git a/src/initscripts/sysconfig/rc.local b/src/initscripts/sysconfig/rc.local
index 5b89b8279f3b3e591011bd8d0d10372d16fa6ebc..83ea8e70398dc653b6acab3ec76d7a843e8bd796 100644 (file)
--- a/src/initscripts/sysconfig/rc.local
+++ b/src/initscripts/sysconfig/rc.local
@@ -20,8 +20,3 @@
 ###############################################################################
 # Used for private calls after boot                                           #
 ###############################################################################
-
-# power button shutdown
-if grep -q '^button' /proc/modules ; then
-    ( head -1 /proc/acpi/event | grep -q 'button/power PWRF' && poweroff ) &
-fi