policy/org.freedesktop.NetworkManager.policy
data/NetworkManager.service
+data/NetworkManager-wait-online.service
data/org.freedesktop.NetworkManager.service
cli/src/nmcli
if HAVE_SYSTEMD
-systemdsystemunit_DATA = NetworkManager.service
+systemdsystemunit_DATA = \
+ NetworkManager.service \
+ NetworkManager-wait-online.service
NetworkManager.service: NetworkManager.service.in
$(edit) $< >$@
+NetworkManager-wait-online.service: NetworkManager-wait-online.service.in
+ $(edit) $< >$@
+
servicedir = $(datadir)/dbus-1/system-services
service_in_files = org.freedesktop.NetworkManager.service.in
service_DATA = $(service_in_files:.service.in=.service)
endif
edit = sed \
+ -e 's|@bindir[@]|$(bindir)|g' \
-e 's|@sbindir[@]|$(sbindir)|g' \
-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
-e 's|@localstatedir[@]|$(localstatedir)|g'
EXTRA_DIST = \
NetworkManager.service.in \
+ NetworkManager-wait-online.service.in \
org.freedesktop.NetworkManager.service.in
-CLEANFILES = NetworkManager.service org.freedesktop.NetworkManager.service
-
+CLEANFILES = NetworkManager.service NetworkManager-wait-online.service org.freedesktop.NetworkManager.service
--- /dev/null
+[Unit]
+Description=Network Manager Wait Online
+Requires=NetworkManager.service
+Wants=network.target
+Before=network.target
+
+[Service]
+Type=oneshot
+ExecStart=@bindir@/nm-online -q --timeout=30
+
+[Install]
+WantedBy=multi-user.target
[Unit]
Description=Network Manager
After=syslog.target
+Wants=network.target
+Before=network.target
[Service]
Type=dbus
ExecStart=@sbindir@/NetworkManager --no-daemon
[Install]
-WantedBy=network.target multi-user.target
+WantedBy=multi-user.target
Alias=dbus-org.freedesktop.NetworkManager.service