Make acpid more robust for start-stop-daemon.

Package-Manager: portage-2.1.2_rc2-r5

diff --git a/sys-power/acpid/ChangeLog b/sys-power/acpid/ChangeLog
index 9ee6b7f7b16224eb767c84fcd627955adaeda3fb..3c762e3a95f447b4238fa90afaac4517805f6999 100644 (file)
--- a/sys-power/acpid/ChangeLog
+++ b/sys-power/acpid/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-power/acpid
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.23 2006/07/04 20:07:45 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.24 2006/12/07 00:08:44 uberlord Exp $
+
+  07 Dec 2006; Roy Marples <uberlord@gentoo.org> files/acpid-1.0.4-init.d:
+  Make acpid more robust for start-stop-daemon.
 
   04 Jul 2006; Patrick McLean <chutzpah@gentoo.org> metadata.xml:
   Take over maintainership.

diff --git a/sys-power/acpid/files/acpid-1.0.4-init.d b/sys-power/acpid/files/acpid-1.0.4-init.d
index a6272987f9c857b911100f1aeaa55c279b6540d7..e468035822708152ba88ea8b8a574088d876a7ae 100644 (file)
--- a/sys-power/acpid/files/acpid-1.0.4-init.d
+++ b/sys-power/acpid/files/acpid-1.0.4-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/files/acpid-1.0.4-init.d,v 1.4 2006/08/20 04:16:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/files/acpid-1.0.4-init.d,v 1.5 2006/12/07 00:08:44 uberlord Exp $
 
 opts="reload"
 
@@ -20,7 +20,7 @@ start() {
        checkconfig || return 1
 
        ebegin "Starting acpid"
-       acpid ${ACPID_OPTIONS}
+       start-stop-daemon --start --exec /usr/sbin/acpid -- ${ACPID_OPTIONS}
        eend $?
 }
 
@@ -32,6 +32,6 @@ stop() {
 
 reload() {
        ebegin "Reloading acpid configuration"
-       killall -HUP acpid
+       start-stop-daemon --stop --oknodo --exec /usr/sbin/acpid --signal HUP
        eend $?
 }