[PATCH 0/2] acpid fixes

[PATCH 0/2] acpid fixes

[Mark Hatle]

Baogen Shang (2):
  acpid: fix acpid boot error
  acpid: fix acpid break down

 meta/recipes-bsp/acpid/acpid/init      | 5 +++--
 meta/recipes-bsp/acpid/acpid_1.0.10.bb | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

-- 
1.8.1.2.545.g2f19ada

[PATCH 1/2] acpid: fix acpid boot error

[Mark Hatle]

From: Baogen Shang <baogen.shang@windriver.com>

when booting board,the acpid daemon display some error information.
the information as follow:
acpid: opendir(/etc/acpi/events): No such file or directory
the path "/etc/acpi/events" does not exist,so building the directory
to fix the bug.

Signed-off-by: Baogen Shang <baogen.shang@windriver.com>
Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
---
 meta/recipes-bsp/acpid/acpid/init      | 1 +
 meta/recipes-bsp/acpid/acpid_1.0.10.bb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-bsp/acpid/acpid/init b/meta/recipes-bsp/acpid/acpid/init
index 9f2c0d4..726d9ff 100755
--- a/meta/recipes-bsp/acpid/acpid/init
+++ b/meta/recipes-bsp/acpid/acpid/init
@@ -2,6 +2,7 @@
 
 test -x /usr/sbin/acpid || exit 0
 test -d /proc/acpi || exit 0
+mkdir -p /etc/acpi/events
 
 case "$1" in
   start)

[PATCH 2/2] acpid: fix acpid break down

[Mark Hatle]

From: Baogen Shang <baogen.shang@windriver.com>

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@windriver.com>
Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
---
 meta/recipes-bsp/acpid/acpid/init      | 4 ++--
 meta/recipes-bsp/acpid/acpid_1.0.10.bb | 2 +-
 2 files changed, 3 insertions(+), 3 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)