diff options
author | Ross Burton <ross.burton@intel.com> | 2013-04-16 15:25:03 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-16 16:51:51 +0100 |
commit | 6f02de25fb9c1be946175216e449e2e6e95e46b7 (patch) | |
tree | a99db8ad60f8def59ae123bb21d04ac7e9f6ff4d /meta | |
parent | ddbe0247656088f78f566fdd5d9f9e2182d6e1ad (diff) | |
download | poky-6f02de25fb9c1be946175216e449e2e6e95e46b7.tar.gz |
avahi: don't call DBus init script directly
After installing Avahi we need DBus to reload it's configuration. In a
pure-systemd image there isn't a DBus init script to reload, so cut out the
middleman and just sent SIGHUP to all running dbus-daemon processes instead.
(From OE-Core rev: b3e468294a0723b3ceafe2022bf9d735eee64678)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-connectivity/avahi/avahi.inc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index d8d9a9df87..c302f87979 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc | |||
@@ -136,11 +136,7 @@ do_install() { | |||
136 | 136 | ||
137 | pkg_postinst_avahi-daemon () { | 137 | pkg_postinst_avahi-daemon () { |
138 | if [ -z "$D" ]; then | 138 | if [ -z "$D" ]; then |
139 | DBUSPID=`pidof dbus-daemon` | 139 | killall -q -HUP dbus-daemon || true |
140 | |||
141 | if [ "x$DBUSPID" != "x" ]; then | ||
142 | /etc/init.d/dbus-1 force-reload | ||
143 | fi | ||
144 | fi | 140 | fi |
145 | } | 141 | } |
146 | 142 | ||