From 21388fc6c11be326dbdae193dd05dce56fdb5b03 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 14:49:27 -0400 Subject: [PATCH 03/13] WRS: 0001-Disable-zeroconf-route.patch Conflicts: SPECS/initscripts.spec --- SOURCES/sysconfig-network.conf | 1 + SPECS/initscripts.spec | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 SOURCES/sysconfig-network.conf diff --git a/SOURCES/sysconfig-network.conf b/SOURCES/sysconfig-network.conf new file mode 100644 index 0000000..5b2803b --- /dev/null +++ b/SOURCES/sysconfig-network.conf @@ -0,0 +1 @@ +NOZEROCONF=yes diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec index 5349c54..6a7a76d 100644 --- a/SPECS/initscripts.spec +++ b/SPECS/initscripts.spec @@ -4,12 +4,13 @@ Version: 9.49.41 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1%{?dist} +Release: 1%{?dist}.4 URL: https://github.com/fedora-sysv/initscripts Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz # WRS Source1: sysctl.conf +Source2: sysconfig-network.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Obsoletes: initscripts-legacy <= 9.39 @@ -89,6 +90,7 @@ chmod 600 $RPM_BUILD_ROOT/etc/crypttab # WRS: Overwrite with our config install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/sysctl.conf +install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/network %pre /usr/sbin/groupadd -g 22 -r -f utmp @@ -222,6 +224,8 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/libexec/initscripts/legacy-actions %ghost %{_localstatedir}/log/dmesg %ghost %{_localstatedir}/log/dmesg.old +# WRS +/etc/sysconfig/network %files -n debugmode %defattr(-,root,root) -- 1.9.1