rpms/wpa_supplicant
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix systemd startup ordering (rh #815091)

Browse Source
This commit is contained in:
Dan Williams 2012-05-01 12:06:05 -05:00
parent 661e6b910e
commit bea794b2d0
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources
View File

@ -1 +1 @@
eb3495560baa793f67c423409cc1fd5b wpa_supplicant-1.0-rc2.git20120302.tar.gz 8a3134a6df4229877bbd9f577b208ee9 wpa_supplicant-1.0-rc3.tar.gz

4
wpa_supplicant-dbus-service-file-args.patch
View File

@ -5,7 +5,7 @@ diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.
[D-BUS Service] [D-BUS Service]
Name=fi.w1.wpa_supplicant1 Name=fi.w1.wpa_supplicant1
-Exec=@BINDIR@/wpa_supplicant -u -Exec=@BINDIR@/wpa_supplicant -u
+Exec=@SBINDIR@/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -B -u -f /var/log/wpa_supplicant.log -P /var/run/wpa_supplicant.pid +Exec=@BINDIR@/wpa_supplicant -B -u -f /var/log/wpa_supplicant.log -c /etc/wpa_supplicant/wpa_supplicant.conf -P /var/run/wpa_supplicant.pid
User=root User=root
SystemdService=wpa_supplicant.service SystemdService=wpa_supplicant.service
diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in.fedora wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in.fedora wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in
@ -15,6 +15,6 @@ diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplican
[D-BUS Service] [D-BUS Service]
Name=fi.epitest.hostap.WPASupplicant Name=fi.epitest.hostap.WPASupplicant
-Exec=@BINDIR@/wpa_supplicant -u -Exec=@BINDIR@/wpa_supplicant -u
+Exec=@SBINDIR@/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -B -u -f /var/log/wpa_supplicant.log -P /var/run/wpa_supplicant.pid +Exec=@BINDIR@/wpa_supplicant -B -u -f /var/log/wpa_supplicant.log -c /etc/wpa_supplicant/wpa_supplicant.conf -P /var/run/wpa_supplicant.pid
User=root User=root
SystemdService=wpa_supplicant.service SystemdService=wpa_supplicant.service

8
wpa_supplicant.service
View File

@ -1,11 +1,13 @@
[Unit] [Unit]
Description=WPA Supplicant daemon Description=WPA Supplicant daemon
After=syslog.target network.target Before=network.target
After=syslog.target
[Service] [Service]
Type=forking Type=dbus
BusName=fi.w1.wpa_supplicant1
EnvironmentFile=-/etc/sysconfig/wpa_supplicant EnvironmentFile=-/etc/sysconfig/wpa_supplicant
ExecStart=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf $INTERFACES $DRIVERS -B -u $OTHER_ARGS ExecStart=/usr/sbin/wpa_supplicant -u -f /var/log/wpa_supplicant.log -c /etc/wpa_supplicant/wpa_supplicant.conf $INTERFACES $DRIVERS $OTHER_ARGS
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

13
wpa_supplicant.spec
View File

@ -1,11 +1,11 @@
%define rcver -rc2 %define rcver -rc3
%define snapshot .git20120302 %define snapshot %{nil}
Summary: WPA/WPA2/IEEE 802.1X Supplicant Summary: WPA/WPA2/IEEE 802.1X Supplicant
Name: wpa_supplicant Name: wpa_supplicant
Epoch: 1 Epoch: 1
Version: 1.0 Version: 1.0
Release: 0.3%{?dist} Release: 0.4%{?dist}
License: BSD License: BSD
Group: System Environment/Base Group: System Environment/Base
Source0: http://w1.fi/releases/%{name}-%{version}%{rcver}%{snapshot}.tar.gz Source0: http://w1.fi/releases/%{name}-%{version}%{rcver}%{snapshot}.tar.gz
@ -111,6 +111,9 @@ pushd wpa_supplicant
cp %{SOURCE1} .config cp %{SOURCE1} .config
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
# yes, BINDIR=_sbindir
BINDIR="%{_sbindir}" ; export BINDIR ;
LIBDIR="%{_libdir}" ; export LIBDIR ;
make %{_smp_mflags} make %{_smp_mflags}
%if %{build_gui} %if %{build_gui}
QTDIR=%{_libdir}/qt4 make wpa_gui-qt4 %{_smp_mflags} QTDIR=%{_libdir}/qt4 make wpa_gui-qt4 %{_smp_mflags}
@ -229,6 +232,10 @@ fi
%postun -n libeap -p /sbin/ldconfig %postun -n libeap -p /sbin/ldconfig
%changelog %changelog
* Tue May 1 2012 Dan Williams <dcbw@redhat.com> - 1:1.0-0.4
- Update to wpa_supplicant 1.0-rc3
- Fix systemd target dependencies (rh #815091)
* Fri Mar 2 2012 Dan Williams <dcbw@redhat.com> - 1:1.0-0.3 * Fri Mar 2 2012 Dan Williams <dcbw@redhat.com> - 1:1.0-0.3
- Update to latest 1.0 git snapshot - Update to latest 1.0 git snapshot
- Rebuild against libnl3 - Rebuild against libnl3