Use correct (multi-user) target when installing systemd units

The 'network.target' is special (per systemd.special(7)), and is to be
brought up indirectly when network is actually configured (i.e. through
DHCP or static address settings).

Irrelevant of that, all services should be always installed in
multi-user.target.

[Bug 427]

diff --git a/wpa_supplicant/systemd/wpa_supplicant-nl80211@.service.in b/wpa_supplicant/systemd/wpa_supplicant-nl80211@.service.in
index 4d9c14628df22851e56c8e961be5c37ed8226871..76aba12735b536bbedeca3686c99d2f925cd5c97 100644 (file)
--- a/wpa_supplicant/systemd/wpa_supplicant-nl80211@.service.in
+++ b/wpa_supplicant/systemd/wpa_supplicant-nl80211@.service.in
@@ -10,4 +10,4 @@ Type=simple
 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
+Alias=multi-user.target.wants/wpa_supplicant-nl80211@wlan0.service

diff --git a/wpa_supplicant/systemd/wpa_supplicant-wired@.service.in b/wpa_supplicant/systemd/wpa_supplicant-wired@.service.in
index f2e7f11216c9ee3b808ced74939e499bf52187d2..ff384ae90349bc45c2ac823c7b011fdfc947f628 100644 (file)
--- a/wpa_supplicant/systemd/wpa_supplicant-wired@.service.in
+++ b/wpa_supplicant/systemd/wpa_supplicant-wired@.service.in
@@ -10,4 +10,4 @@ Type=simple
 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
+Alias=multi-user.target.wants/wpa_supplicant-wired@wlan0.service

diff --git a/wpa_supplicant/systemd/wpa_supplicant.service.in b/wpa_supplicant/systemd/wpa_supplicant.service.in
index 5b947ac02d5650d031c65fe391af60b281487335..4351ad8f5f27f9811d5b8acaaa561cf2cad7397c 100644 (file)
--- a/wpa_supplicant/systemd/wpa_supplicant.service.in
+++ b/wpa_supplicant/systemd/wpa_supplicant.service.in
@@ -7,5 +7,5 @@ BusName=fi.epitest.hostap.WPASupplicant
 ExecStart=@BINDIR@/wpa_supplicant -u
 
 [Install]
-WantedBy=network.target
+WantedBy=multi-user.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
index 0340b4de0e2e26152dae807370ad01261962a22c..c215567599e7497933a36a6ec8cd2196a9aef529 100644 (file)
--- a/wpa_supplicant/systemd/wpa_supplicant@.service.in
+++ b/wpa_supplicant/systemd/wpa_supplicant@.service.in
@@ -10,4 +10,4 @@ Type=simple
 ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-%I.conf -i%I
 
 [Install]
-Alias=network.target.wants/wpa_supplicant@wlan0.service
+Alias=multi-user.target.wants/wpa_supplicant@wlan0.service