diff options
| author | Michal Schmidt <mschmidt@redhat.com> | 2011-06-17 09:14:23 +0200 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2011-06-17 14:02:39 +0200 |
| commit | ffbb7df4b85c68aafe4578750a1f78fc9d734fb8 (patch) | |
| tree | 6e0b4f1354b6c9ec3d692d1e31385c7b120d25fe /data | |
| parent | 502548b6ca3e183315214df97d266e16bf1914fa (diff) | |
| download | NetworkManager-ffbb7df4b85c68aafe4578750a1f78fc9d734fb8.tar.gz | |
systemd: fix NetworkManager-wait-online.service to wait for link up (rh #710502)
Since commit 0ce4b6b4128f19177072d1bb5f5c3a87783256ba
NetworkManager-wait-online.service quits immediately if there is no link yet.
Fix it by removing the '-x' option.
But if we do just that, NM-w-o would add a useless 30 seconds delay in the
case when NM is not running at all.
Solve this by adding a Requisite= dependency on NM.
https://bugzilla.redhat.com/show_bug.cgi?id=710502
Diffstat (limited to 'data')
| -rw-r--r-- | data/NetworkManager-wait-online.service.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/data/NetworkManager-wait-online.service.in b/data/NetworkManager-wait-online.service.in index 0772568fff..fd9be418ea 100644 --- a/data/NetworkManager-wait-online.service.in +++ b/data/NetworkManager-wait-online.service.in @@ -1,12 +1,13 @@ [Unit] Description=Network Manager Wait Online +Requisite=NetworkManager.service After=NetworkManager.service Wants=network.target Before=network.target [Service] Type=oneshot -ExecStart=@bindir@/nm-online -q -x --timeout=30 +ExecStart=@bindir@/nm-online -q --timeout=30 [Install] WantedBy=network.target |