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

Enable syslog by default

Browse Source 
This gives more relevant data to journal than logging in stdout. Also, pid file
is no longer needed, since we're a Type=dbus service.

The flat logging file is removed since it's not needed when we're logging into
journal. We probably can remove the logrotate file too.

The -u argument is moved into the service file as we can't really remove it
without changing the service's Type.
This commit is contained in:
Lubomir Rintel 2015-10-31 22:09:05 +01:00
parent dd5ca60f4a
commit dfd04df55b
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build-config
View File

@ -26,6 +26,7 @@ CONFIG_WPS=y
CONFIG_EAP_IKEV2=y CONFIG_EAP_IKEV2=y
CONFIG_PKCS12=y CONFIG_PKCS12=y
CONFIG_SMARTCARD=y CONFIG_SMARTCARD=y
CONFIG_DEBUG_SYSLOG=y
CONFIG_DEBUG_FILE=y CONFIG_DEBUG_FILE=y
CONFIG_BACKEND=file CONFIG_BACKEND=file
CONFIG_PEERKEY=y CONFIG_PEERKEY=y

2
wpa_supplicant.service
View File

@ -6,7 +6,7 @@ Before=network.target
Type=dbus Type=dbus
BusName=fi.w1.wpa_supplicant1 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 $OTHER_ARGS ExecStart=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -u $INTERFACES $DRIVERS $OTHER_ARGS
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

6
wpa_supplicant.spec
View File

@ -7,7 +7,7 @@ Summary: WPA/WPA2/IEEE 802.1X Supplicant
Name: wpa_supplicant Name: wpa_supplicant
Epoch: 1 Epoch: 1
Version: 2.5 Version: 2.5
Release: 1%{?dist} Release: 2%{?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
@ -207,6 +207,10 @@ fi
%endif %endif
%changelog %changelog
* Sat Oct 31 2015 Lubomir Rintel <lkundrak@v3.sk> - 1:2.5-2
- Enable syslog by default
- Drop writing a pid and log file
* Tue Oct 27 2015 Lubomir Rintel <lkundrak@v3.sk> - 1:2.5-1 * Tue Oct 27 2015 Lubomir Rintel <lkundrak@v3.sk> - 1:2.5-1
- Update to version 2.5 - Update to version 2.5

9
wpa_supplicant.sysconfig
View File

@ -7,10 +7,5 @@ INTERFACES=""
DRIVERS="" DRIVERS=""
# Other arguments # Other arguments
# -u Enable the D-Bus interface (required for use with NetworkManager) # -s Use syslog logging backend
# -f Log to /var/log/wpa_supplicant.log OTHER_ARGS="-s"
# -P Write pid file to /var/run/wpa_supplicant.pid
# required to return proper codes by init scripts (e.g. double "start" action)
# -B to daemonize that has to be used together with -P is already in wpa_supplicant.init.d
OTHER_ARGS="-u -f /var/log/wpa_supplicant.log -P /var/run/wpa_supplicant.pid"