diff options
| author | Tom Gundersen <teg@jklm.no> | 2014-04-23 17:42:55 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2014-04-24 00:23:07 +0200 |
| commit | 3a67e927e3be7efb8edf314a31aa4f8f5cba4f53 (patch) | |
| tree | 5736719c730b85db89f6be3135290c565a02d046 /Makefile.am | |
| parent | fa4f8f9bc1fbef6a658cff39ac185bbedea6caf4 (diff) | |
networkd-wait-online: improve interoptability and enable by default
To make sure we don't delay boot on systems where (some) network links are managed by someone else
we don't block if something else has successfully brought up a link.
We will still block until all links we are aware of that are managed by networkd have been
configured, but if no such links exist, and someone else have configured a link sufficiently
that it has a carrier, it may be that the link is ready so we should no longer block.
Note that in all likelyhood the link is not ready (no addresses/routes configured),
so whatever network managment daemon configured it should provide a similar wait-online
service to block network-online.target until it is ready.
The aim is to block as long as we know networking is not fully configured, but no longer. This
will allow systemd-networkd-wait-online.service to be enabled on any system, even if we don't
know whether networkd is the main/only network manager.
Even in the case networking is fully configured by networkd, the default behavior may not be
sufficient: if two links need to be configured, but the first is fully configured before the
second one appears we will assume the network is up. To work around that, we allow specifying
specific devices to wait for before considering the network up.
This unit is enabled by default, just like systemd-networkd, but will only be pulled in if
anyone pulls in network-online.target.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 6967b6f289..f261c476da 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4134,6 +4134,7 @@ noinst_LTLIBRARIES += \ libsystemd-networkd-core.la libsystemd_networkd_core_la_SOURCES = \ + src/libsystemd-network/network-internal.h \ src/network/networkd.h \ src/network/networkd-link.c \ src/network/networkd-netdev.c \ @@ -4154,16 +4155,23 @@ libsystemd_networkd_core_la_LIBADD = \ libsystemd-shared.la nodist_systemunit_DATA += \ - units/systemd-networkd.service + units/systemd-networkd.service \ + units/systemd-networkd-wait-online.service GENERAL_ALIASES += \ - $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service + $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \ + $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service rootlibexec_PROGRAMS += \ systemd-networkd-wait-online systemd_networkd_wait_online_SOURCES = \ - src/network/networkd-wait-online.c + src/libsystemd-network/network-internal.h \ + src/network/networkd-wait-online.c \ + src/network/networkd-wait-online.h + +nodist_systemd_networkd_wait_online_SOURCES = \ + src/network/networkd-wait-online-gperf.c systemd_networkd_wait_online_LDADD = \ libsystemd-internal.la \ @@ -4178,14 +4186,19 @@ test_network_LDADD = \ tests += \ test-network +dist_pkgsysconf_DATA += \ + src/network/networkd-wait-online.conf + EXTRA_DIST += \ src/network/networkd-network-gperf.gperf \ src/network/networkd-netdev-gperf.gperf \ + src/network/networkd-wait-online-gperf.gperf \ units/systemd-networkd.service.in CLEANFILES += \ src/network/networkd-network-gperf.c \ - src/network/networkd-netdev-gperf.c + src/network/networkd-netdev-gperf.c \ + src/network/networkd-wait-online-gperf.c endif # ------------------------------------------------------------------------------ |