summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2013-07-22 16:14:55 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-29 13:08:58 +0100
commit6bb09dad028bb01ec7dbe8cb4511c4357fa1b52d (patch)
tree0c3a924a0a6b1404d52071f114a63999a39e2187 /meta/recipes-core
parentdd8865aac9b0cb86f16897e59f6fd77a2c6cb000 (diff)
downloadpoky-6bb09dad028bb01ec7dbe8cb4511c4357fa1b52d.tar.gz
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>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init4
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()
57 dbus-uuidgen --ensure 57 dbus-uuidgen --ensure
58 58
59 echo -n "Starting $DESC: " 59 echo -n "Starting $DESC: "
60 start-stop-daemon --start --quiet --pidfile $PIDFILE \ 60 start-stop-daemon -o --start --quiet --pidfile $PIDFILE \
61 --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS 61 --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
62 echo "$NAME." 62 echo "$NAME."
63 if [ -d $EVENTDIR ]; then 63 if [ -d $EVENTDIR ]; then
@@ -72,7 +72,7 @@ shut_it_down()
72 run-parts --arg=stop $EVENTDIR 72 run-parts --arg=stop $EVENTDIR
73 fi 73 fi
74 echo -n "Stopping $DESC: " 74 echo -n "Stopping $DESC: "
75 start-stop-daemon --stop --quiet --pidfile $PIDFILE \ 75 start-stop-daemon -o --stop --quiet --pidfile $PIDFILE \
76 --user $DAEMONUSER 76 --user $DAEMONUSER
77 # We no longer include these arguments so that start-stop-daemon 77 # We no longer include these arguments so that start-stop-daemon
78 # can do its job even given that we may have been upgraded. 78 # can do its job even given that we may have been upgraded.