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

diff --git a/data/NetworkManager-wait-online.service.in b/data/NetworkManager-wait-online.service.in
index 0772568..fd9be41 100644 (file)
--- 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