system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-14 12:05:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

service: don't install dependency for "NetworkManager-wait-online.service" to "network-online.target.wants"

Browse source 
If we install "NetworkManager-wait-online.service" in the
"network-online.target.wants" directory, network-online.target always
pulls in NetworkManager-wait-online.service. As it was, it could only
be disabled by masking the service.

Instead, we should enable NetworkManager-wait-online.sevice via
systemd's preset. That is already done for Fedora 26 and newer.

Note that NetworkManager-wait-online.sevice already has Install.WantedBy.
This way, the dependency is created automatically when enabling the service.

https://bugzilla.redhat.com/show_bug.cgi?id=1455704
This commit is contained in:
Thomas Haller 2017-07-17 15:16:16 +02:00
parent f42b4960f8
commit d61eaf2545
2 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Makefile.am
View file

@ -34,7 +34,6 @@ dist_dependencies =
dist_configure_check =
install_data_hook =
install_exec_hook =
install_exec_local =
uninstall_hook =
TESTS =
BUILT_SOURCES =
@ -3604,12 +3603,6 @@ data/org.freedesktop.NetworkManager.service: $(srcdir)/data/org.freedesktop.Netw
service_DATA += data/org.freedesktop.NetworkManager.service
install-exec-local-data:
install -d $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants
ln -sf $(systemdsystemunitdir)/NetworkManager-wait-online.service $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants
install_exec_local += install-exec-local-data
endif
examples_DATA += data/server.conf
@ -4495,8 +4488,6 @@ dist-hook: $(dist_hook)
install-exec-hook: $(install_exec_hook)
install-exec-local: $(install_exec_local)
install-data-hook: $(install_data_hook)
$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/conf.d
$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/system-connections

2
contrib/fedora/rpm/NetworkManager.spec
View file

@ -552,8 +552,6 @@ fi
%{systemd_dir}/NetworkManager.service
%{systemd_dir}/NetworkManager-wait-online.service
%{systemd_dir}/NetworkManager-dispatcher.service
%dir %{systemd_dir}/network-online.target.wants
%{systemd_dir}/network-online.target.wants/NetworkManager-wait-online.service
%dir %{_datadir}/doc/NetworkManager/examples
%{_datadir}/doc/NetworkManager/examples/server.conf
%doc NEWS AUTHORS README CONTRIBUTING TODO