| Message ID | 1439390682-28996-1-git-send-email-floppym@gentoo.org |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, Aug 12, 2015 at 10:44:42AM -0400, Mike Gilbert wrote: > Ordering the units before network.target causes them to be stopped > after network.target on shutdown. This ensures that any network > filesystems will be unmounted before wpa_supplicant is killed. > > Adding Wants=network.target ensures that network.target will be included > in the active dependency graph. This is typical of units which are > involved in networking setup functions. Thanks, applied.
diff --git a/wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in b/wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in index bfdee25..03ac507 100644 --- a/wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in +++ b/wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in @@ -2,6 +2,8 @@ Description=WPA supplicant daemon (interface- and nl80211 driver-specific version) Requires=sys-subsystem-net-devices-%i.device After=sys-subsystem-net-devices-%i.device +Before=network.target +Wants=network.target # NetworkManager users will probably want the dbus version instead. diff --git a/wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in b/wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in index 20ba0ad..c8a744d 100644 --- a/wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in +++ b/wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in @@ -2,6 +2,8 @@ Description=WPA supplicant daemon (interface- and wired driver-specific version) Requires=sys-subsystem-net-devices-%i.device After=sys-subsystem-net-devices-%i.device +Before=network.target +Wants=network.target # NetworkManager users will probably want the dbus version instead. diff --git a/wpa_supplicant/systemd/wpa_supplicant.service.arg.in b/wpa_supplicant/systemd/wpa_supplicant.service.arg.in index 10e62bc..7788b38 100644 --- a/wpa_supplicant/systemd/wpa_supplicant.service.arg.in +++ b/wpa_supplicant/systemd/wpa_supplicant.service.arg.in @@ -2,6 +2,8 @@ Description=WPA supplicant daemon (interface-specific version) Requires=sys-subsystem-net-devices-%i.device After=sys-subsystem-net-devices-%i.device +Before=network.target +Wants=network.target # NetworkManager users will probably want the dbus version instead. diff --git a/wpa_supplicant/systemd/wpa_supplicant.service.in b/wpa_supplicant/systemd/wpa_supplicant.service.in index 4351ad8..ea964ce 100644 --- a/wpa_supplicant/systemd/wpa_supplicant.service.in +++ b/wpa_supplicant/systemd/wpa_supplicant.service.in @@ -1,5 +1,7 @@ [Unit] Description=WPA supplicant +Before=network.target +Wants=network.target [Service] Type=dbus
Ordering the units before network.target causes them to be stopped after network.target on shutdown. This ensures that any network filesystems will be unmounted before wpa_supplicant is killed. Adding Wants=network.target ensures that network.target will be included in the active dependency graph. This is typical of units which are involved in networking setup functions. Signed-off-by: Mike Gilbert <floppym@gentoo.org> --- wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in | 2 ++ wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in | 2 ++ wpa_supplicant/systemd/wpa_supplicant.service.arg.in | 2 ++ wpa_supplicant/systemd/wpa_supplicant.service.in | 2 ++ 4 files changed, 8 insertions(+)