This is useful, since in Gentoo BINDIR=/usr/sbin. --- wpa_supplicant/Makefile | 9 +++++++++ .../dbus/fi.epitest.hostap.WPASupplicant.service | 5 ----- .../fi.epitest.hostap.WPASupplicant.service.in | 5 +++++ wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service | 5 ----- .../dbus/fi.w1.wpa_supplicant1.service.in | 5 +++++ wpa_supplicant/systemd/wpa_supplicant.service | 11 ----------- wpa_supplicant/systemd/wpa_supplicant.service.in | 11 +++++++++++ wpa_supplicant/systemd/wpa_supplicant@.service | 11 ----------- wpa_supplicant/systemd/wpa_supplic...@.service.in | 11 +++++++++++ 9 files changed, 41 insertions(+), 32 deletions(-) delete mode 100644 wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service create mode 100644 wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in delete mode 100644 wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service create mode 100644 wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in delete mode 100644 wpa_supplicant/systemd/wpa_supplicant.service create mode 100644 wpa_supplicant/systemd/wpa_supplicant.service.in delete mode 100644 wpa_supplicant/systemd/wpa_supplicant@.service create mode 100644 wpa_supplicant/systemd/wpa_supplic...@.service.in
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index 3536084..ded4593 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -21,6 +21,12 @@ ifndef CONFIG_NO_WPA_PASSPHRASE ALL += wpa_passphrase endif +ALL += systemd/wpa_supplicant.service +ALL += systemd/wpa_supplicant@.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 +1428,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)|' $< >$@ + 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 deleted file mode 100644 index 2a2edc1..0000000 --- a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service +++ /dev/null @@ -1,5 +0,0 @@ -[D-BUS Service] -Name=fi.epitest.hostap.WPASupplicant -Exec=/sbin/wpa_supplicant -u -User=root -SystemdService=wpa_supplicant.service diff --git a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in new file mode 100644 index 0000000..a75918f --- /dev/null +++ b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in @@ -0,0 +1,5 @@ +[D-BUS Service] +Name=fi.epitest.hostap.WPASupplicant +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 deleted file mode 100644 index ff40621..0000000 --- a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service +++ /dev/null @@ -1,5 +0,0 @@ -[D-BUS Service] -Name=fi.w1.wpa_supplicant1 -Exec=/sbin/wpa_supplicant -u -User=root -SystemdService=wpa_supplicant.service diff --git a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in new file mode 100644 index 0000000..d97ff39 --- /dev/null +++ b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in @@ -0,0 +1,5 @@ +[D-BUS Service] +Name=fi.w1.wpa_supplicant1 +Exec=@BINDIR@/wpa_supplicant -u +User=root +SystemdService=wpa_supplicant.service diff --git a/wpa_supplicant/systemd/wpa_supplicant.service b/wpa_supplicant/systemd/wpa_supplicant.service deleted file mode 100644 index c2610ca..0000000 --- a/wpa_supplicant/systemd/wpa_supplicant.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=WPA supplicant - -[Service] -Type=dbus -BusName=fi.epitest.hostap.WPASupplicant -ExecStart=/sbin/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant.conf -u - -[Install] -WantedBy=network.target -Alias=dbus-fi.epitest.hostap.WPASupplicant.service diff --git a/wpa_supplicant/systemd/wpa_supplicant.service.in b/wpa_supplicant/systemd/wpa_supplicant.service.in new file mode 100644 index 0000000..d22fcf9 --- /dev/null +++ b/wpa_supplicant/systemd/wpa_supplicant.service.in @@ -0,0 +1,11 @@ +[Unit] +Description=WPA supplicant + +[Service] +Type=dbus +BusName=fi.epitest.hostap.WPASupplicant +ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant.conf -u + +[Install] +WantedBy=network.target +Alias=dbus-fi.epitest.hostap.WPASupplicant.service diff --git a/wpa_supplicant/systemd/wpa_supplicant@.service b/wpa_supplicant/systemd/wpa_supplicant@.service deleted file mode 100644 index 61847eb..0000000 --- a/wpa_supplicant/systemd/wpa_supplicant@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=WPA supplicant daemon (interface-specific version) - -# NetworkManager users will probably want the dbus version instead. - -[Service] -Type=simple -ExecStart=/sbin/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant.conf -i%I - -[Install] -Alias=network.target.wants/wpa_supplicant@wlan0.service diff --git a/wpa_supplicant/systemd/wpa_supplic...@.service.in b/wpa_supplicant/systemd/wpa_supplic...@.service.in new file mode 100644 index 0000000..e427d79 --- /dev/null +++ b/wpa_supplicant/systemd/wpa_supplic...@.service.in @@ -0,0 +1,11 @@ +[Unit] +Description=WPA supplicant daemon (interface-specific version) + +# NetworkManager users will probably want the dbus version instead. + +[Service] +Type=simple +ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant.conf -i%I + +[Install] +Alias=network.target.wants/wpa_supplicant@wlan0.service -- 1.7.6 _______________________________________________ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel