From 4c605b166a63f879ef71becdaad1bee0a0c769d0 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 22 Jul 2013 16:14:55 +0800 Subject: [PATCH] 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 Signed-off-by: Jackie Huang Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init | 4 ++-- 1 file 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 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. -- 2.7.4