sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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.

(From OE-Core rev: 03e745f18f9da22cfba53bb0057bdb0af4a49fca)

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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jackie Huang 2013-07-22 16:14:55 +08:00 committed by Richard Purdie
parent dd8865aac9
commit 6bb09dad02
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init
View File

@ -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.