aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant
diff options
context:
space:
mode:
authorHenry Gebhardt <hsggebhardt@googlemail.com>2011-07-15 09:25:02 (GMT)
committerJouni Malinen <j@w1.fi>2011-07-15 09:25:02 (GMT)
commitf0573c7989e88023d1e9bb17d775e944cd956ae8 (patch)
treebfab35a0595c712b534b819f5acb96ab15ea642d /wpa_supplicant
parent2ecaec50c8eb772e131b6c468b60edbcc00e660c (diff)
downloadhostap-f0573c7989e88023d1e9bb17d775e944cd956ae8.zip
hostap-f0573c7989e88023d1e9bb17d775e944cd956ae8.tar.gz
hostap-f0573c7989e88023d1e9bb17d775e944cd956ae8.tar.bz2
wpa_supplicant: Edit BINDIR in dbus and systemd service files
This is useful, since in Gentoo BINDIR=/usr/sbin.
Diffstat (limited to 'wpa_supplicant')
-rw-r--r--wpa_supplicant/.gitignore1
-rw-r--r--wpa_supplicant/Makefile11
-rw-r--r--wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in (renamed from wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service)2
-rw-r--r--wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in (renamed from wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service)2
-rw-r--r--wpa_supplicant/systemd/wpa_supplicant-nl80211@.service.in (renamed from wpa_supplicant/systemd/wpa_supplicant-nl80211@.service)2
-rw-r--r--wpa_supplicant/systemd/wpa_supplicant-wired@.service.in (renamed from wpa_supplicant/systemd/wpa_supplicant-wired@.service)2
-rw-r--r--wpa_supplicant/systemd/wpa_supplicant.service.in (renamed from wpa_supplicant/systemd/wpa_supplicant.service)2
-rw-r--r--wpa_supplicant/systemd/wpa_supplicant@.service.in (renamed from wpa_supplicant/systemd/wpa_supplicant@.service)2
8 files changed, 18 insertions, 6 deletions
diff --git a/wpa_supplicant/.gitignore b/wpa_supplicant/.gitignore
new file mode 100644
index 0000000..0e3ad1b
--- /dev/null
+++ b/wpa_supplicant/.gitignore
@@ -0,0 +1 @@
+*.service
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 3536084..4b3f5a0 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -21,6 +21,14 @@ ifndef CONFIG_NO_WPA_PASSPHRASE
ALL += wpa_passphrase
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
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) $<
@$(E) " CC " $<
+%.service: %.service.in
+ sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@
+
wpa_supplicant.exe: wpa_supplicant
mv -f $< $@
wpa_cli.exe: wpa_cli
diff --git a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in
index 2a2edc1..a75918f 100644
--- a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
+++ b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in
@@ -1,5 +1,5 @@
[D-BUS Service]
Name=fi.epitest.hostap.WPASupplicant
-Exec=/sbin/wpa_supplicant -u
+Exec=@BINDIR@/wpa_supplicant -u
User=root
SystemdService=wpa_supplicant.service
diff --git a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in
index ff40621..d97ff39 100644
--- a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service
+++ b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in
@@ -1,5 +1,5 @@
[D-BUS Service]
Name=fi.w1.wpa_supplicant1
-Exec=/sbin/wpa_supplicant -u
+Exec=@BINDIR@/wpa_supplicant -u
User=root
SystemdService=wpa_supplicant.service
diff --git a/wpa_supplicant/systemd/wpa_supplicant-nl80211@.service b/wpa_supplicant/systemd/wpa_supplicant-nl80211@.service.in
index 04aa1ba..4d9c146 100644
--- a/wpa_supplicant/systemd/wpa_supplicant-nl80211@.service
+++ b/wpa_supplicant/systemd/wpa_supplicant-nl80211@.service.in
@@ -7,7 +7,7 @@ After=sys-subsystem-net-devices-%i.device
[Service]
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]
Alias=network.target.wants/wpa_supplicant-nl80211@wlan0.service
diff --git a/wpa_supplicant/systemd/wpa_supplicant-wired@.service b/wpa_supplicant/systemd/wpa_supplicant-wired@.service.in
index 83f8c91..f2e7f11 100644
--- a/wpa_supplicant/systemd/wpa_supplicant-wired@.service
+++ b/wpa_supplicant/systemd/wpa_supplicant-wired@.service.in
@@ -7,7 +7,7 @@ After=sys-subsystem-net-devices-%i.device
[Service]
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]
Alias=network.target.wants/wpa_supplicant-wired@wlan0.service
diff --git a/wpa_supplicant/systemd/wpa_supplicant.service b/wpa_supplicant/systemd/wpa_supplicant.service.in
index a9ab246..5b947ac 100644
--- a/wpa_supplicant/systemd/wpa_supplicant.service
+++ b/wpa_supplicant/systemd/wpa_supplicant.service.in
@@ -4,7 +4,7 @@ Description=WPA supplicant
[Service]
Type=dbus
BusName=fi.epitest.hostap.WPASupplicant
-ExecStart=/sbin/wpa_supplicant -u
+ExecStart=@BINDIR@/wpa_supplicant -u
[Install]
WantedBy=network.target
diff --git a/wpa_supplicant/systemd/wpa_supplicant@.service b/wpa_supplicant/systemd/wpa_supplicant@.service.in
index 129dd1f..0340b4d 100644
--- a/wpa_supplicant/systemd/wpa_supplicant@.service
+++ b/wpa_supplicant/systemd/wpa_supplicant@.service.in
@@ -7,7 +7,7 @@ After=sys-subsystem-net-devices-%i.device
[Service]
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]
Alias=network.target.wants/wpa_supplicant@wlan0.service