78 lines
2.5 KiB
Diff
78 lines
2.5 KiB
Diff
|
From b6cea24d6191d9ccdcd1ac38a5322e3da73218db Mon Sep 17 00:00:00 2001
|
||
|
|
From: Marcin Niestroj <m.niestroj@grinn-global.com>
|
||
|
|
Date: Mon, 11 Apr 2016 13:23:54 +0200
|
||
|
|
Subject: [PATCH] systemd: Update service files according to dbus interface
|
||
|
|
version used
|
||
|
|
|
||
|
|
systemd service files were supplied with old DBus bus name. After
|
||
|
|
service activation systemd was waiting for appearance of specified bus
|
||
|
|
name to consider it started successfully. However, if wpa_supplicant was
|
||
|
|
compiled only with new dbus interface name, then systemd didn't notice
|
||
|
|
configured (old) DBus bus name appearance. In the end service was
|
||
|
|
considered malfunctioning and it was deactivated.
|
||
|
|
|
||
|
|
Update systemd service BusName property according to supported DBus
|
||
|
|
interface version.
|
||
|
|
|
||
|
|
Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
|
||
|
|
---
|
||
|
|
wpa_supplicant/Makefile | 8 ++++++--
|
||
|
|
wpa_supplicant/systemd/wpa_supplicant.service.in | 4 ++--
|
||
|
|
2 files changed, 8 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
|
||
|
|
index ad9ead9..fbd1b25 100644
|
||
|
|
--- a/wpa_supplicant/Makefile
|
||
|
|
+++ b/wpa_supplicant/Makefile
|
||
|
|
@@ -1374,6 +1374,7 @@ ifndef DBUS_INCLUDE
|
||
|
|
DBUS_INCLUDE := $(shell $(PKG_CONFIG) --cflags dbus-1)
|
||
|
|
endif
|
||
|
|
DBUS_CFLAGS += $(DBUS_INCLUDE)
|
||
|
|
+DBUS_INTERFACE=fi.epitest.hostap.WPASupplicant
|
||
|
|
endif
|
||
|
|
|
||
|
|
ifdef CONFIG_CTRL_IFACE_DBUS_NEW
|
||
|
|
@@ -1399,6 +1400,7 @@ DBUS_OBJS += dbus/dbus_new_introspect.o
|
||
|
|
DBUS_CFLAGS += -DCONFIG_CTRL_IFACE_DBUS_INTRO
|
||
|
|
endif
|
||
|
|
DBUS_CFLAGS += $(DBUS_INCLUDE)
|
||
|
|
+DBUS_INTERFACE=fi.w1.wpa_supplicant1
|
||
|
|
endif
|
||
|
|
|
||
|
|
ifdef DBUS
|
||
|
|
@@ -1760,11 +1762,13 @@ else
|
||
|
|
endif
|
||
|
|
|
||
|
|
%.service: %.service.in
|
||
|
|
- $(Q)sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@
|
||
|
|
+ $(Q)sed -e 's|\@BINDIR\@|$(BINDIR)|g' \
|
||
|
|
+ -e 's|\@DBUS_INTERFACE\@|$(DBUS_INTERFACE)|g' $< >$@
|
||
|
|
@$(E) " sed" $<
|
||
|
|
|
||
|
|
%@.service: %.service.arg.in
|
||
|
|
- $(Q)sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@
|
||
|
|
+ $(Q)sed -e 's|\@BINDIR\@|$(BINDIR)|g' \
|
||
|
|
+ -e 's|\@DBUS_INTERFACE\@|$(DBUS_INTERFACE)|g' $< >$@
|
||
|
|
@$(E) " sed" $<
|
||
|
|
|
||
|
|
wpa_supplicant.exe: wpa_supplicant
|
||
|
|
diff --git a/wpa_supplicant/systemd/wpa_supplicant.service.in b/wpa_supplicant/systemd/wpa_supplicant.service.in
|
||
|
|
index ea964ce..bc5d49a 100644
|
||
|
|
--- a/wpa_supplicant/systemd/wpa_supplicant.service.in
|
||
|
|
+++ b/wpa_supplicant/systemd/wpa_supplicant.service.in
|
||
|
|
@@ -5,9 +5,9 @@ Wants=network.target
|
||
|
|
|
||
|
|
[Service]
|
||
|
|
Type=dbus
|
||
|
|
-BusName=fi.epitest.hostap.WPASupplicant
|
||
|
|
+BusName=@DBUS_INTERFACE@
|
||
|
|
ExecStart=@BINDIR@/wpa_supplicant -u
|
||
|
|
|
||
|
|
[Install]
|
||
|
|
WantedBy=multi-user.target
|
||
|
|
-Alias=dbus-fi.epitest.hostap.WPASupplicant.service
|
||
|
|
+Alias=dbus-@DBUS_INTERFACE@.service
|
||
|
|
--
|
||
|
|
2.8.0
|
||
|
|
|