diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-04-06 04:30:02 +0200 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2011-04-06 17:33:51 -0500 |
| commit | c4d387efb88ab0cc4dea4ae17e60c8360b5e45a8 (patch) | |
| tree | 845b1340ce7e4cea4be36699c1290d8f85d23e90 | |
| parent | 1a61a0a2ca75a8af7040bc784873a1621fffde7f (diff) | |
systemd: pull in network.service and introduce NetworkManager-wait-online.service
This pulls in network.target from NetworkManager.service (and not the
other way round), as suggested and agreed on on the systemd ML:
http://lists.freedesktop.org/archives/systemd-devel/2011-March/001692.html
This also introduces an auxiliary service
NetworkManager-wait-online.service that can be used to order a unit
after the point where the network is available. When this is enabled
with "systemd enable NetworkManager-wait-online.service" the unit
network.target will be delayed until the network is up, which is
suitable for synchronizing NFS mounts and similar to it.
https://bugzilla.redhat.com/show_bug.cgi?id=692008
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | data/Makefile.am | 12 | ||||
| -rw-r--r-- | data/NetworkManager-wait-online.service.in | 12 | ||||
| -rw-r--r-- | data/NetworkManager.service.in | 4 |
4 files changed, 25 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index bad5e311f8..64507e92e8 100644 --- a/.gitignore +++ b/.gitignore @@ -179,6 +179,7 @@ policy/org.freedesktop.network-manager-settings.system.policy policy/org.freedesktop.NetworkManager.policy data/NetworkManager.service +data/NetworkManager-wait-online.service data/org.freedesktop.NetworkManager.service cli/src/nmcli diff --git a/data/Makefile.am b/data/Makefile.am index f91d3a8255..2a1d1cf4f8 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,10 +1,15 @@ 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) @@ -14,13 +19,14 @@ $(service_DATA): $(service_in_files) Makefile 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 diff --git a/data/NetworkManager-wait-online.service.in b/data/NetworkManager-wait-online.service.in new file mode 100644 index 0000000000..1a43d1744c --- /dev/null +++ b/data/NetworkManager-wait-online.service.in @@ -0,0 +1,12 @@ +[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 diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in index d93fc6709d..bb169fb479 100644 --- a/data/NetworkManager.service.in +++ b/data/NetworkManager.service.in @@ -1,6 +1,8 @@ [Unit] Description=Network Manager After=syslog.target +Wants=network.target +Before=network.target [Service] Type=dbus @@ -8,5 +10,5 @@ BusName=org.freedesktop.NetworkManager ExecStart=@sbindir@/NetworkManager --no-daemon [Install] -WantedBy=network.target multi-user.target +WantedBy=multi-user.target Alias=dbus-org.freedesktop.NetworkManager.service |