From 61a021539135f5b14c2f7c2eabdb8e32164a2ce0d35f7461b7ca8ca8fffe4c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 23 Dec 2016 12:48:31 +0000 Subject: [PATCH] Accepting request 447507 from home:alarrosa:branches:hardware - Added .service files that accept interfaces as %i arguments so it's possible to call the daemon with: "systemctl start wpa_supplicant@$INTERFACE_NAME.service" (like openvpn for example) OBS-URL: https://build.opensuse.org/request/show/447507 OBS-URL: https://build.opensuse.org/package/show/hardware/wpa_supplicant?expand=0&rev=72 --- wpa_supplicant.changes | 8 ++++++++ wpa_supplicant.spec | 3 +++ wpa_supplicant@.service | 13 +++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 wpa_supplicant@.service diff --git a/wpa_supplicant.changes b/wpa_supplicant.changes index 68d501a..aad3a26 100644 --- a/wpa_supplicant.changes +++ b/wpa_supplicant.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Dec 23 11:12:05 UTC 2016 - dwaas@suse.com + +- Added .service files that accept interfaces as %i arguments so it's possible + to call the daemon with: + "systemctl start wpa_supplicant@$INTERFACE_NAME.service" + (like openvpn for example) + ------------------------------------------------------------------- Thu Oct 6 15:42:23 UTC 2016 - meissner@suse.com diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec index 9ea7888..e2ca6b8 100644 --- a/wpa_supplicant.spec +++ b/wpa_supplicant.spec @@ -30,6 +30,7 @@ Source3: fi.epitest.hostap.WPASupplicant.service Source4: logrotate.wpa_supplicant Source5: fi.w1.wpa_supplicant1.service Source6: wpa_supplicant.service +Source7: wpa_supplicant@.service # wpa_supplicant-flush-debug-output.patch won't go upstream as it might # change timings Patch1: wpa_supplicant-flush-debug-output.patch @@ -108,6 +109,7 @@ install -m 0644 wpa_supplicant/doc/docbook/*.5 %{buildroot}%{_mandir}/man5 install -m 755 wpa_supplicant/wpa_gui-qt4/wpa_gui %{buildroot}%{_sbindir} install -d %{buildroot}%{_unitdir} install -m 0644 %{SOURCE6} %{buildroot}%{_unitdir} +install -m 0644 %{SOURCE7} %{buildroot}%{_unitdir} ln -s service %{buildroot}/%{_sbindir}/rcwpa_supplicant # avoid spurious dependency on /usr/bin/python chmod -x wpa_supplicant/examples/*.py @@ -141,6 +143,7 @@ ln -s wpa_supplicant.service %{buildroot}%{_unitdir}/dbus-fi.w1.wpa_supplicant1. %dir %{_rundir}/%{name} %ghost %{_rundir}/%{name} %{_unitdir}/wpa_supplicant.service +%{_unitdir}/wpa_supplicant@.service %{_unitdir}/dbus-fi.epitest.hostap.WPASupplicant.service %{_unitdir}/dbus-fi.w1.wpa_supplicant1.service %dir %{_sysconfdir}/%{name} diff --git a/wpa_supplicant@.service b/wpa_supplicant@.service new file mode 100644 index 0000000..e569a77 --- /dev/null +++ b/wpa_supplicant@.service @@ -0,0 +1,13 @@ +[Unit] +Description=WPA Supplicant daemon (interface %i) +Before=network.target +After=dbus.service + +[Service] +Type=dbus +BusName=fi.w1.wpa_supplicant1 +ExecStart=/usr/sbin/wpa_supplicant -i%i -c /etc/wpa_supplicant/wpa_supplicant.conf -u -f /var/log/wpa_supplicant.log + +[Install] +WantedBy=multi-user.target +