diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-07-17 15:16:16 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-07-17 16:04:21 +0200 |
| commit | d61eaf2545c819cab17c29c4c13a3a3bd94b38a6 (patch) | |
| tree | 6d7a90786de38213c7b4aac1bf25df3b582578be | |
| parent | f42b4960f8a43ad6ef67c48e9c30b00660546682 (diff) | |
| download | NetworkManager-d61eaf2545c819cab17c29c4c13a3a3bd94b38a6.tar.gz | |
service: don't install dependency for "NetworkManager-wait-online.service" to "network-online.target.wants"
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
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 2 |
2 files changed, 0 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index b97da487fc..b540c0c2f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 44287da5d5..0c4c80f778 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -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 |