[oe-commits] Baogen Shang : acpid: fix acpid break down

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: b7a8daf52c9befc773f320e54999bb91efdac334
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b7a8daf52c9befc773f320e54999bb91efdac334

Author: Baogen Shang <baogen.shang at windriver.com>
Date:   Thu Nov 21 00:53:27 2013 -0600

acpid: fix acpid break down

when execute the command "/etc/init.d/acpid stop" and "/etc/init.d/acpid
restart", it prompt "no /usr/sbin/acpid found;none killed",The acpid could
not be restarted because the script start with "!/bin/sh –e", that will
make the script stop when an error occurred. So when no 'acpid' running
(we have stopped it), the script would exit and 'restart' operation would
be stopped by ‘stop’ operation.so avoiding the error occurred, add "-o"
option,exit status 0 (not 1)if nothing done.

Signed-off-by: Baogen Shang <baogen.shang at windriver.com>
Signed-off-by: Jeff Polk <jeff.polk at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-bsp/acpid/acpid/init | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-bsp/acpid/acpid/init b/meta/recipes-bsp/acpid/acpid/init
index 726d9ff..40ff385 100755
--- a/meta/recipes-bsp/acpid/acpid/init
+++ b/meta/recipes-bsp/acpid/acpid/init
@@ -10,13 +10,13 @@ case "$1" in
     if [ ! -d /etc/acpi/events ]; then
         echo "There is not any rule configuration file."
     else
-        start-stop-daemon -S -x /usr/sbin/acpid -- -c /etc/acpi/events
+        start-stop-daemon -o -S -x /usr/sbin/acpid -- -c /etc/acpi/events
         echo "acpid."
     fi
     ;;
   stop)
     echo -n "Stopping Advanced Configuration and Power Interface daemon: "
-    start-stop-daemon -K -x /usr/sbin/acpid
+    start-stop-daemon -o -K -x /usr/sbin/acpid
     echo "acpid."
     ;;
   restart|force-reload)