diff options
author | Bill Nottingham <notting@redhat.com> | 2011-05-10 16:34:11 -0500 |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2011-05-10 16:34:11 -0500 |
commit | 0ce4b6b4128f19177072d1bb5f5c3a87783256ba (patch) | |
tree | 33e66578beff84f212f6ce1616ea8f1b0de341ab /data | |
parent | 9ff4914ccc6bac1df3aa14655e32e9c38d093816 (diff) | |
download | NetworkManager-0ce4b6b4128f19177072d1bb5f5c3a87783256ba.tar.gz |
systemd: tweak NM-wait-online.service
1) Don't require NM, but run after it. This allows this service
to be installed without bringing up NetworkManager. Add -x so that
it exits if NM isn't running.
2) Install as a want of network.target, instead of multi-user.target.
This allows us to skip it if nothing requires network.target or the
legacy $network SysV capability.
Diffstat (limited to 'data')
-rw-r--r-- | data/NetworkManager-wait-online.service.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/NetworkManager-wait-online.service.in b/data/NetworkManager-wait-online.service.in index 1a43d1744c..0772568fff 100644 --- a/data/NetworkManager-wait-online.service.in +++ b/data/NetworkManager-wait-online.service.in @@ -1,12 +1,12 @@ [Unit] Description=Network Manager Wait Online -Requires=NetworkManager.service +After=NetworkManager.service Wants=network.target Before=network.target [Service] Type=oneshot -ExecStart=@bindir@/nm-online -q --timeout=30 +ExecStart=@bindir@/nm-online -q -x --timeout=30 [Install] -WantedBy=multi-user.target +WantedBy=network.target |