From c252851f00478268ffa827f1cf66ed44e930e0c9 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 24 Jul 2018 14:05:55 +0200 Subject: [PATCH] rpm: own /etc/sysconfig/network-scripts We don't rely on initscripts. If they're gone, we still use the directory. (cherry picked from commit 0413704470855ec3dc5ebe2f5e7985f865363fd2) --- Makefile.am | 5 +++++ contrib/fedora/rpm/NetworkManager.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/Makefile.am b/Makefile.am index cdb5cfc9d5..b1a2e69e69 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2213,6 +2213,11 @@ dist_libexec_SCRIPTS += \ src/settings/plugins/ifcfg-rh/nm-ifup \ src/settings/plugins/ifcfg-rh/nm-ifdown +install-data-hook-ifcfg-rh: + $(mkinstalldirs) -m 0755 $(DESTDIR)$(sysconfdir)/sysconfig/network-scripts + +install_data_hook += install-data-hook-ifcfg-rh + endif EXTRA_DIST += \ diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index a8a02ced65..c5346c6f76 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -667,6 +667,7 @@ fi %{_mandir}/man8/* %dir %{_localstatedir}/lib/NetworkManager %dir %{_sysconfdir}/NetworkManager/system-connections +%dir %{_sysconfdir}/sysconfig/network-scripts %{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service %{_datadir}/polkit-1/actions/*.policy