diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2013-07-22 16:14:55 +0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2013-07-25 23:44:26 -0700 |
commit | 03e745f18f9da22cfba53bb0057bdb0af4a49fca (patch) | |
tree | 0db3977d9d23bf10f0056ea9fdc79e5683dcfe6a /meta | |
parent | ec95dfeea1f17eb232563e105085852058a86c0b (diff) | |
download | openembedded-core-03e745f18f9da22cfba53bb0057bdb0af4a49fca.tar.gz openembedded-core-03e745f18f9da22cfba53bb0057bdb0af4a49fca.tar.bz2 openembedded-core-03e745f18f9da22cfba53bb0057bdb0af4a49fca.zip |
dbus: add -o option into start-stop-daemon arguments
/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>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init | 4 |
1 files changed, 2 insertions, 2 deletions
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 64f2170255..0351190af7 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. |