From bcfce7d1465fda4cc11c30583cdf39d66f4ec3db1aa1a0a03cddd7de1c92ceb1 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <sbrabec@suse.com>
Date: Tue, 13 Dec 2016 20:54:51 +0000
Subject: [PATCH] Accepting request 435757 from home:dwaas:branches:hardware

- .service files now accept interfaces as %i arguments 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/435757
OBS-URL: https://build.opensuse.org/package/show/hardware/wpa_supplicant?expand=0&rev=70
---
 wpa_supplicant.changes  |  8 ++++++++
 wpa_supplicant.service  | 13 -------------
 wpa_supplicant.spec     | 16 ++++++++--------
 wpa_supplicant@.service | 13 +++++++++++++
 4 files changed, 29 insertions(+), 21 deletions(-)
 delete mode 100644 wpa_supplicant.service
 create mode 100644 wpa_supplicant@.service

diff --git a/wpa_supplicant.changes b/wpa_supplicant.changes
index 68d501a..9189f5c 100644
--- a/wpa_supplicant.changes
+++ b/wpa_supplicant.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Oct 15 15:40:39 UTC 2016 - dwaas@suse.com
+
+- .service files now accept interfaces as %i arguments 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.service b/wpa_supplicant.service
deleted file mode 100644
index 2cddf41..0000000
--- a/wpa_supplicant.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=WPA Supplicant daemon
-Before=network.target
-After=dbus.service
-
-[Service]
-Type=dbus
-BusName=fi.w1.wpa_supplicant1
-ExecStart=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -u -f /var/log/wpa_supplicant.log
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
index 9ea7888..b3faf42 100644
--- a/wpa_supplicant.spec
+++ b/wpa_supplicant.spec
@@ -29,7 +29,7 @@ Source2:        %{name}.conf
 Source3:        fi.epitest.hostap.WPASupplicant.service
 Source4:        logrotate.wpa_supplicant
 Source5:        fi.w1.wpa_supplicant1.service
-Source6:        wpa_supplicant.service
+Source6:        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
@@ -112,20 +112,20 @@ ln -s service %{buildroot}/%{_sbindir}/rcwpa_supplicant
 # avoid spurious dependency on /usr/bin/python
 chmod -x wpa_supplicant/examples/*.py
 # dbus auto activation boo#966535
-ln -s wpa_supplicant.service %{buildroot}%{_unitdir}/dbus-fi.epitest.hostap.WPASupplicant.service
-ln -s wpa_supplicant.service %{buildroot}%{_unitdir}/dbus-fi.w1.wpa_supplicant1.service
+ln -s wpa_supplicant@.service %{buildroot}%{_unitdir}/dbus-fi.epitest.hostap.WPASupplicant.service
+ln -s wpa_supplicant@.service %{buildroot}%{_unitdir}/dbus-fi.w1.wpa_supplicant1.service
 
 %pre
-%service_add_pre wpa_supplicant.service
+%service_add_pre wpa_supplicant@.service
 
 %post
-%service_add_post wpa_supplicant.service
+%service_add_post wpa_supplicant@.service
 
 %preun
-%service_del_preun wpa_supplicant.service
+%service_del_preun wpa_supplicant@.service
 
 %postun
-%service_del_postun wpa_supplicant.service
+%service_del_postun wpa_supplicant@.service
 
 %files
 %defattr(-,root,root)
@@ -140,7 +140,7 @@ ln -s wpa_supplicant.service %{buildroot}%{_unitdir}/dbus-fi.w1.wpa_supplicant1.
 %config(noreplace) %{_sysconfdir}/logrotate.d/wpa_supplicant
 %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
+