pool/wpa_supplicant
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 435757 from home:dwaas:branches:hardware

Browse Source 
- .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
This commit is contained in:
Stanislav Brabec 2016-12-13 20:54:51 +00:00 committed by Git OBS Bridge
parent 887e149164
commit bcfce7d146
4 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wpa_supplicant.changes
View File

@ -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 Thu Oct 6 15:42:23 UTC 2016 - meissner@suse.com

13
wpa_supplicant.service
View File

@ -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

16
wpa_supplicant.spec
View File

@ -29,7 +29,7 @@ Source2: %{name}.conf
Source3: fi.epitest.hostap.WPASupplicant.service Source3: fi.epitest.hostap.WPASupplicant.service
Source4: logrotate.wpa_supplicant Source4: logrotate.wpa_supplicant
Source5: fi.w1.wpa_supplicant1.service 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 # wpa_supplicant-flush-debug-output.patch won't go upstream as it might
# change timings # change timings
Patch1: wpa_supplicant-flush-debug-output.patch 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 # avoid spurious dependency on /usr/bin/python
chmod -x wpa_supplicant/examples/*.py chmod -x wpa_supplicant/examples/*.py
# dbus auto activation boo#966535 # 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.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.w1.wpa_supplicant1.service
%pre %pre
%service_add_pre wpa_supplicant.service %service_add_pre wpa_supplicant@.service
%post %post
%service_add_post wpa_supplicant.service %service_add_post wpa_supplicant@.service
%preun %preun
%service_del_preun wpa_supplicant.service %service_del_preun wpa_supplicant@.service
%postun %postun
%service_del_postun wpa_supplicant.service %service_del_postun wpa_supplicant@.service
%files %files
%defattr(-,root,root) %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 %config(noreplace) %{_sysconfdir}/logrotate.d/wpa_supplicant
%dir %{_rundir}/%{name} %dir %{_rundir}/%{name}
%ghost %{_rundir}/%{name} %ghost %{_rundir}/%{name}
%{_unitdir}/wpa_supplicant.service %{_unitdir}/wpa_supplicant@.service
%{_unitdir}/dbus-fi.epitest.hostap.WPASupplicant.service %{_unitdir}/dbus-fi.epitest.hostap.WPASupplicant.service
%{_unitdir}/dbus-fi.w1.wpa_supplicant1.service %{_unitdir}/dbus-fi.w1.wpa_supplicant1.service
%dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}

13
wpa_supplicant@.service Normal file
View File

@ -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