mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-07 21:50:18 +01:00
afd30f5f3b
Make network-online.target depend on NetworkManager-wait-online.service just as is done in Fedora. This makes network-online.target work with NetworkManager as described in systemd documentation. An alternative way would be to use a combination of setting Install.WantedBy to network-online.target and enabling the service by default. This alternative approach is currently used by systemd-networkd. https://bugzilla.gnome.org/show_bug.cgi?id=728965 Acked-By: Dan Williams <dcbw@redhat.com>
62 lines
1.7 KiB
Makefile
62 lines
1.7 KiB
Makefile
|
|
if HAVE_SYSTEMD
|
|
systemdsystemunit_DATA = \
|
|
NetworkManager.service \
|
|
NetworkManager-wait-online.service \
|
|
NetworkManager-dispatcher.service
|
|
|
|
NetworkManager.service: NetworkManager.service.in
|
|
$(edit) $< >$@
|
|
|
|
if HAVE_SYSTEMD_200
|
|
NetworkManager-wait-online.service: NetworkManager-wait-online.service.in
|
|
$(edit) $< >$@
|
|
else
|
|
NetworkManager-wait-online.service: NetworkManager-wait-online-systemd-pre200.service.in
|
|
$(edit) $< >$@
|
|
endif
|
|
|
|
NetworkManager-dispatcher.service: NetworkManager-dispatcher.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)
|
|
|
|
$(service_DATA): $(service_in_files) Makefile
|
|
$(edit) $< >$@
|
|
|
|
install-exec-local:
|
|
install -d $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants
|
|
ln -s $(systemdsystemunitdir)/NetworkManager-wait-online.service $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants
|
|
endif
|
|
|
|
examplesdir = $(docdir)/examples
|
|
examples_DATA = server.conf
|
|
|
|
server.conf: server.conf.in
|
|
$(edit) $< >$@
|
|
|
|
edit = sed \
|
|
-e 's|@bindir[@]|$(bindir)|g' \
|
|
-e 's|@sbindir[@]|$(sbindir)|g' \
|
|
-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
|
|
-e 's|@localstatedir[@]|$(localstatedir)|g' \
|
|
-e 's|@libexecdir[@]|$(libexecdir)|g' \
|
|
-e 's|@DISTRO_NETWORK_SERVICE[@]|$(DISTRO_NETWORK_SERVICE)|g'
|
|
|
|
EXTRA_DIST = \
|
|
NetworkManager.service.in \
|
|
NetworkManager-wait-online.service.in \
|
|
NetworkManager-wait-online-systemd-pre200.service.in \
|
|
NetworkManager-dispatcher.service.in \
|
|
org.freedesktop.NetworkManager.service.in \
|
|
server.conf.in
|
|
|
|
CLEANFILES = \
|
|
NetworkManager.service \
|
|
NetworkManager-wait-online.service \
|
|
NetworkManager-dispatcher.service \
|
|
org.freedesktop.NetworkManager.service \
|
|
server.conf
|
|
|