From efde904e7c80a1bc4a5129bdb5d3bda563878393 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 02 2016 13:53:32 +0000 Subject: import initscripts-9.49.30-1.el7_2.3 --- diff --git a/SOURCES/0001-source_config-tell-NetworkManger-to-load-ifcfg-file-.patch b/SOURCES/0001-source_config-tell-NetworkManger-to-load-ifcfg-file-.patch new file mode 100644 index 0000000..f20df5b --- /dev/null +++ b/SOURCES/0001-source_config-tell-NetworkManger-to-load-ifcfg-file-.patch @@ -0,0 +1,36 @@ +From a4eefc6bdfb1e6872ef83428b833a0cc6474e8e2 Mon Sep 17 00:00:00 2001 +From: Thomas Haller +Date: Mon, 13 Jun 2016 16:40:46 +0200 +Subject: [PATCH] source_config: tell NetworkManger to load ifcfg file even for + NM_CONTROLLED=no + +Cherry-picked from: 61fb1cb +Resolves: #1345919 +--- + sysconfig/network-scripts/network-functions | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions +index 61a851f..db729cc 100644 +--- a/sysconfig/network-scripts/network-functions ++++ b/sysconfig/network-scripts/network-functions +@@ -170,10 +170,12 @@ source_config () + else + ISALIAS=no + fi +- if ! is_false $NM_CONTROLLED && is_nm_running; then +- nmcli con load "/etc/sysconfig/network-scripts/$CONFIG" +- UUID=$(get_uuid_by_config $CONFIG) +- [ -n "$UUID" ] && _use_nm=true ++ if is_nm_running; then ++ nmcli con load "/etc/sysconfig/network-scripts/$CONFIG" ++ if ! is_false $NM_CONTROLLED; then ++ UUID=$(get_uuid_by_config $CONFIG) ++ [ -n "$UUID" ] && _use_nm=true ++ fi + fi + } + +-- +2.8.3 + diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec index 3be539b..19e2102 100644 --- a/SPECS/initscripts.spec +++ b/SPECS/initscripts.spec @@ -4,7 +4,7 @@ Version: 9.49.30 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1%{?dist}.2 +Release: 1%{?dist}.3 URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -37,6 +37,7 @@ Provides: /sbin/service Patch1: 0001-autorelabel-call-dracut-initramfs-restore-before-for.patch Patch2: 0001-autorelabel-turn-quota-off-before-relabeling.patch +Patch3: 0001-source_config-tell-NetworkManger-to-load-ifcfg-file-.patch %description The initscripts package contains basic system scripts used @@ -58,6 +59,7 @@ Currently, this consists of various memory checking code. %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build make @@ -221,7 +223,10 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Tue Mar 15 2016 Lukáš Nykrýn - 9.49.30-2.1 +* Thu Jun 16 2016 Lukáš Nykrýn - 9.49.30-1.3 +- source_config: tell NetworkManger to load ifcfg file even for NM_CONTROLLED=no + +* Tue Mar 15 2016 Lukáš Nykrýn - 9.49.30-1.2 - autorelabel: turn quota off before relabeling * Tue Feb 02 2016 Lukáš Nykrýn - 9.49.30-1.1