wpa_supplicant: Edit BINDIR in dbus and systemd service files

This is useful, since in Gentoo BINDIR=/usr/sbin.

diff --git a/wpa_supplicant/.gitignore b/wpa_supplicant/.gitignore
new file mode 100644 (file)
index 0000000..0e3ad1b
--- /dev/null
+++ b/wpa_supplicant/.gitignore
@@ -0,0 +1 @@
+*.service

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 3536084cea34a8c2c871664e536de79b681bac41..4b3f5a056d1430fa3e11478d9ecabc0b518746d0 100644 (file)
--- 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
similarity index 75%
rename from wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
rename to wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in
index 2a2edc1da2c706819b6f2d2497ee8d142bb11668..a75918f9380b655619b2c6185f69bcb9a0b69fda 100644 (file)
--- 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
similarity index 73%
rename from wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service
rename to wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in
index ff406210f2da00184f357ba97a8a8e137ed15267..d97ff392175d3c7e1a66f568a579e87416107d82 100644 (file)
--- 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
similarity index 77%
rename from wpa_supplicant/systemd/wpa_supplicant-nl80211@.service
rename to wpa_supplicant/systemd/wpa_supplicant-nl80211@.service.in
index 04aa1ba13126a2b95e8c76c17e18bf76271ce72c..4d9c14628df22851e56c8e961be5c37ed8226871 100644 (file)
--- 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
similarity index 77%
rename from wpa_supplicant/systemd/wpa_supplicant-wired@.service
rename to wpa_supplicant/systemd/wpa_supplicant-wired@.service.in
index 83f8c91476e3595996aa7e332324dc8e5aee289b..f2e7f11216c9ee3b808ced74939e499bf52187d2 100644 (file)
--- 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
similarity index 83%
rename from wpa_supplicant/systemd/wpa_supplicant.service
rename to wpa_supplicant/systemd/wpa_supplicant.service.in
index a9ab246318d00ed10127ebda120e374f68425f72..5b947ac02d5650d031c65fe391af60b281487335 100644 (file)
--- 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
similarity index 79%
rename from wpa_supplicant/systemd/wpa_supplicant@.service
rename to wpa_supplicant/systemd/wpa_supplicant@.service.in
index 129dd1f44c26be89c806693a4964adbcb2768e77..0340b4de0e2e26152dae807370ad01261962a22c 100644 (file)
--- 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