Patchwork [2/2] wpa-supplicant: don't call DBus init script directly

login
register
mail settings
Submitter Ross Burton
Date April 16, 2013, 2:25 p.m.
Message ID <1366122304-32216-2-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/48349/
State Accepted
Commit d6fb028de172bb649b905b605f6ddc8402af859a
Headers show

Comments

Ross Burton - April 16, 2013, 2:25 p.m.
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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Patch

diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
index dd85057..e5f7881 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
@@ -84,9 +84,5 @@  pkg_postinst_wpa-supplicant () {
 		exit 0
 	fi
 
-	DBUSPID=`pidof dbus-daemon`
-
-	if [ "x$DBUSPID" != "x" ]; then
-		/etc/init.d/dbus-1 reload || true
-	fi
+	killall -q -HUP dbus-daemon || true
 }