Patchwork [2/2] dbus: add -o option into start-stop-daemon arguments

login
register
mail settings
Submitter jackie huang
Date July 22, 2013, 8:14 a.m.
Message ID <799e99cf845e29f2bcac04cee403f89cf600fa82.1374480160.git.jackie.huang@windriver.com>
Download mbox | patch
Permalink /patch/54155/
State Accepted
Commit 6bb09dad028bb01ec7dbe8cb4511c4357fa1b52d
Headers show

Comments

jackie huang - July 22, 2013, 8:14 a.m.
From: Jackie Huang <jackie.huang@windriver.com>

/etc/init.d/dbus-1 use "set -e" to let the script exit when any command failes.
This will cause "dbus-1 restart" command can't start dbus when dbus is stopped.
so add --oknodo option to let start-stop-daemon exit with friendly return value.
Then commands will work well.

Signed-off-by: Song.Li <Song.Li@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init b/meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init
index 64f2170..0351190 100644
--- a/meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init
+++ b/meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init
@@ -57,7 +57,7 @@  start_it_up()
   dbus-uuidgen --ensure  
 
   echo -n "Starting $DESC: "
-  start-stop-daemon --start --quiet --pidfile $PIDFILE \
+  start-stop-daemon -o --start --quiet --pidfile $PIDFILE \
     --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
   echo "$NAME."
   if [ -d $EVENTDIR ]; then
@@ -72,7 +72,7 @@  shut_it_down()
       run-parts --arg=stop $EVENTDIR
   fi
   echo -n "Stopping $DESC: "
-  start-stop-daemon --stop  --quiet --pidfile $PIDFILE \
+  start-stop-daemon -o --stop  --quiet --pidfile $PIDFILE \
     --user $DAEMONUSER
   # We no longer include these arguments so that start-stop-daemon
   # can do its job even given that we may have been upgraded.