jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wpa_supplicant: Edit BINDIR in dbus and systemd service files

Browse source 
This is useful, since in Gentoo BINDIR=/usr/sbin.
This commit is contained in:
Henry Gebhardt 2011-07-15 12:25:02 +03:00 committed by Jouni Malinen
parent 2ecaec50c8
commit f0573c7989
8 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
wpa_supplicant/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
*.service

11
wpa_supplicant/Makefile
View file

@ -21,6 +21,14 @@ ifndef CONFIG_NO_WPA_PASSPHRASE
ALL += wpa_passphrase ALL += wpa_passphrase
endif endif
ALL += systemd/wpa_supplicant.service
ALL += systemd/wpa_supplicant@.service
ALL += systemd/wpa_supplicant-nl80211@.service
ALL += systemd/wpa_supplicant-wired@.service
ALL += dbus/fi.epitest.hostap.WPASupplicant.service
ALL += dbus/fi.w1.wpa_supplicant1.service
all: verify_config $(ALL) dynamic_eap_methods all: verify_config $(ALL) dynamic_eap_methods
verify_config: verify_config:
@ -1422,6 +1430,9 @@ eap_ikev2.so: ../src/eap_peer/eap_ikev2.c ../src/eap_peer/ikev2.c ../src/eap_com
$(Q)$(CC) -c -o $@ $(CFLAGS) $< $(Q)$(CC) -c -o $@ $(CFLAGS) $<
@$(E) " CC " $< @$(E) " CC " $<
%.service: %.service.in
sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@
wpa_supplicant.exe: wpa_supplicant wpa_supplicant.exe: wpa_supplicant
mv -f $< $@ mv -f $< $@
wpa_cli.exe: wpa_cli wpa_cli.exe: wpa_cli

2
wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service → wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in
View file

@ -1,5 +1,5 @@
[D-BUS Service] [D-BUS Service]
Name=fi.epitest.hostap.WPASupplicant Name=fi.epitest.hostap.WPASupplicant
Exec=/sbin/wpa_supplicant -u Exec=@BINDIR@/wpa_supplicant -u
User=root User=root
SystemdService=wpa_supplicant.service SystemdService=wpa_supplicant.service

2
wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service → wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in
View file

@ -1,5 +1,5 @@
[D-BUS Service] [D-BUS Service]
Name=fi.w1.wpa_supplicant1 Name=fi.w1.wpa_supplicant1
Exec=/sbin/wpa_supplicant -u Exec=@BINDIR@/wpa_supplicant -u
User=root User=root
SystemdService=wpa_supplicant.service SystemdService=wpa_supplicant.service

2
wpa_supplicant/systemd/wpa_supplicant-nl80211@.service → wpa_supplicant/systemd/wpa_supplicant-nl80211@.service.in
View file

@ -7,7 +7,7 @@ After=sys-subsystem-net-devices-%i.device
[Service] [Service]
Type=simple Type=simple
ExecStart=/sbin/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-nl80211-%I.conf -Dnl80211 -i%I ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-nl80211-%I.conf -Dnl80211 -i%I
[Install] [Install]
Alias=network.target.wants/wpa_supplicant-nl80211@wlan0.service Alias=network.target.wants/wpa_supplicant-nl80211@wlan0.service

2
wpa_supplicant/systemd/wpa_supplicant-wired@.service → wpa_supplicant/systemd/wpa_supplicant-wired@.service.in
View file

@ -7,7 +7,7 @@ After=sys-subsystem-net-devices-%i.device
[Service] [Service]
Type=simple Type=simple
ExecStart=/sbin/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-wired-%I.conf -Dwired -i%I ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-wired-%I.conf -Dwired -i%I
[Install] [Install]
Alias=network.target.wants/wpa_supplicant-wired@wlan0.service Alias=network.target.wants/wpa_supplicant-wired@wlan0.service

2
wpa_supplicant/systemd/wpa_supplicant.service → wpa_supplicant/systemd/wpa_supplicant.service.in
View file

@ -4,7 +4,7 @@ Description=WPA supplicant
[Service] [Service]
Type=dbus Type=dbus
BusName=fi.epitest.hostap.WPASupplicant BusName=fi.epitest.hostap.WPASupplicant
ExecStart=/sbin/wpa_supplicant -u ExecStart=@BINDIR@/wpa_supplicant -u
[Install] [Install]
WantedBy=network.target WantedBy=network.target

2
wpa_supplicant/systemd/wpa_supplicant@.service → wpa_supplicant/systemd/wpa_supplicant@.service.in
View file

@ -7,7 +7,7 @@ After=sys-subsystem-net-devices-%i.device
[Service] [Service]
Type=simple Type=simple
ExecStart=/sbin/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-%I.conf -i%I ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-%I.conf -i%I
[Install] [Install]
Alias=network.target.wants/wpa_supplicant@wlan0.service Alias=network.target.wants/wpa_supplicant@wlan0.service