diff options
author | Baogen Shang <baogen.shang@windriver.com> | 2013-11-21 00:53:27 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-22 14:08:32 +0000 |
commit | 05e9f1f8357e0f1d418b72af7d766063ade92ccd (patch) | |
tree | 6b6602214e18c3e6d1e170e1958661ab7b81bd39 | |
parent | 637ad2f8193cd5a708ba246c6f7d26a794ac3e4f (diff) | |
download | poky-05e9f1f8357e0f1d418b72af7d766063ade92ccd.tar.gz |
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.
(From OE-Core rev: b7a8daf52c9befc773f320e54999bb91efdac334)
Signed-off-by: Baogen Shang <baogen.shang@windriver.com>
Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | meta/recipes-bsp/acpid/acpid/init | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-bsp/acpid/acpid/init b/meta/recipes-bsp/acpid/acpid/init index 726d9ffd9e..40ff385c10 100755 --- a/meta/recipes-bsp/acpid/acpid/init +++ b/meta/recipes-bsp/acpid/acpid/init | |||
@@ -10,13 +10,13 @@ case "$1" in | |||
10 | if [ ! -d /etc/acpi/events ]; then | 10 | if [ ! -d /etc/acpi/events ]; then |
11 | echo "There is not any rule configuration file." | 11 | echo "There is not any rule configuration file." |
12 | else | 12 | else |
13 | start-stop-daemon -S -x /usr/sbin/acpid -- -c /etc/acpi/events | 13 | start-stop-daemon -o -S -x /usr/sbin/acpid -- -c /etc/acpi/events |
14 | echo "acpid." | 14 | echo "acpid." |
15 | fi | 15 | fi |
16 | ;; | 16 | ;; |
17 | stop) | 17 | stop) |
18 | echo -n "Stopping Advanced Configuration and Power Interface daemon: " | 18 | echo -n "Stopping Advanced Configuration and Power Interface daemon: " |
19 | start-stop-daemon -K -x /usr/sbin/acpid | 19 | start-stop-daemon -o -K -x /usr/sbin/acpid |
20 | echo "acpid." | 20 | echo "acpid." |
21 | ;; | 21 | ;; |
22 | restart|force-reload) | 22 | restart|force-reload) |