starlingx/integ
Code Issues Proposed changes

de-fuzz initscript patches

Browse Source 
Problem:
- Centos 7.5 upgraded initscripts.
- Porting of initscripts patches did not resolve and 'fuzz' in the line
  numbers of the patches.
- If initscript is built by rpm 4.11, or default version of rpm
  until 4.14 is compiled, a fuzzy patch results in the creating
  of an .orig file.
- Packaging of initscripts failes due to the unexpected, and
  unpackaged .orig file

Solution:
  Safest solution is to de-fuzz our initscripts patches.

  A seperate investigation will bug report will address the
broader issues.

Closes-Bug: 1794611
Change-Id: I1e91a230194c0c21798b7e91b444f929b54106d6
Signed-off-by: Scott Little <scott.little@windriver.com>
This commit is contained in:
Scott Little 2018-09-26 14:02:07 -04:00
parent 80c782abaa
commit e7efbe1105
17 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
base/initscripts/centos/meta_patches/0001-Disable-zeroconf-route.patch
View File

@ -22,7 +22,7 @@ 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.39
@@ -4,12 +4,13 @@ Version: 9.49.41
# ppp-watch is GPLv2+, everything else is GPLv2
License: GPLv2 and GPLv2+
Group: System Environment/Base
@ -37,7 +37,7 @@ index 5349c54..6a7a76d 100644
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Obsoletes: initscripts-legacy <= 9.39
@@ -88,6 +89,7 @@ chmod 600 $RPM_BUILD_ROOT/etc/crypttab
@@ -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
@ -45,7 +45,7 @@ index 5349c54..6a7a76d 100644
%pre
/usr/sbin/groupadd -g 22 -r -f utmp
@@ -220,6 +222,8 @@ rm -rf $RPM_BUILD_ROOT
@@ -222,6 +224,8 @@ rm -rf $RPM_BUILD_ROOT
%dir /usr/libexec/initscripts/legacy-actions
%ghost %{_localstatedir}/log/dmesg
%ghost %{_localstatedir}/log/dmesg.old

6
base/initscripts/centos/meta_patches/0001-Fix-Interfaces-intermittenly-do-not-come-up-on-boot.patch
View File

@ -14,7 +14,7 @@ diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index 5ba669b..63ad994 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -4,7 +4,7 @@ Version: 9.49.39
@@ -4,7 +4,7 @@ Version: 9.49.41
# ppp-watch is GPLv2+, everything else is GPLv2
License: GPLv2 and GPLv2+
Group: System Environment/Base
@ -23,7 +23,7 @@ index 5ba669b..63ad994 100644
URL: https://github.com/fedora-sysv/initscripts
Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -47,6 +47,7 @@ Patch4: support-interface-scriptlets.patch
@@ -48,6 +48,7 @@ Patch4: support-interface-scriptlets.patch
Patch5: relocate-dhclient-leases-to-var-run.patch
Patch6: dhclient-restrict-interfaces-to-those-on-c.patch
Patch7: support-interface-promisc.patch
@ -31,7 +31,7 @@ index 5ba669b..63ad994 100644
%description
The initscripts package contains basic system scripts used
@@ -71,6 +72,7 @@ Currently, this consists of various memory checking code.
@@ -72,6 +73,7 @@ Currently, this consists of various memory checking code.
%patch5 -p1
%patch6 -p1
%patch7 -p1

6
base/initscripts/centos/meta_patches/0001-Support-PROMISC-for-interfaces-config.patch
View File

@ -13,7 +13,7 @@ diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index 6a7a76d..6ec4bea 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -4,7 +4,7 @@ Version: 9.49.39
@@ -4,7 +4,7 @@ Version: 9.49.41
# ppp-watch is GPLv2+, everything else is GPLv2
License: GPLv2 and GPLv2+
Group: System Environment/Base
@ -22,7 +22,7 @@ index 6a7a76d..6ec4bea 100644
URL: https://github.com/fedora-sysv/initscripts
Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -43,6 +43,7 @@ Provides: /sbin/service
@@ -44,6 +44,7 @@ Provides: /sbin/service
Patch4: support-interface-scriptlets.patch
Patch5: relocate-dhclient-leases-to-var-run.patch
Patch6: dhclient-restrict-interfaces-to-those-on-c.patch
@ -30,7 +30,7 @@ index 6a7a76d..6ec4bea 100644
%description
The initscripts package contains basic system scripts used
@@ -66,6 +67,7 @@ Currently, this consists of various memory checking code.
@@ -67,6 +68,7 @@ Currently, this consists of various memory checking code.
%patch4 -p1
%patch5 -p1
%patch6 -p1

2
base/initscripts/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -14,7 +14,7 @@ diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index df59412..fd84a75 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -4,7 +4,7 @@ Version: 9.49.39
@@ -4,7 +4,7 @@ Version: 9.49.41
# ppp-watch is GPLv2+, everything else is GPLv2
License: GPLv2 and GPLv2+
Group: System Environment/Base

6
base/initscripts/centos/meta_patches/force-delay-check-link-down.patch
View File

@ -13,7 +13,7 @@ diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index 63ad994..c806126 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -4,7 +4,7 @@ Version: 9.49.39
@@ -4,7 +4,7 @@ Version: 9.49.41
# ppp-watch is GPLv2+, everything else is GPLv2
License: GPLv2 and GPLv2+
Group: System Environment/Base
@ -22,7 +22,7 @@ index 63ad994..c806126 100644
URL: https://github.com/fedora-sysv/initscripts
Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -48,6 +48,7 @@ Patch5: relocate-dhclient-leases-to-var-run.patch
@@ -49,6 +49,7 @@ Patch5: relocate-dhclient-leases-to-var-run.patch
Patch6: dhclient-restrict-interfaces-to-those-on-c.patch
Patch7: support-interface-promisc.patch
Patch8: 0001-dhclient-remove-1-arg.patch
@ -30,7 +30,7 @@ index 63ad994..c806126 100644
%description
The initscripts package contains basic system scripts used
@@ -73,6 +74,7 @@ Currently, this consists of various memory checking code.
@@ -74,6 +75,7 @@ Currently, this consists of various memory checking code.
%patch6 -p1
%patch7 -p1
%patch8 -p1

6
base/initscripts/centos/meta_patches/run-ifdown-on-all-interfaces.patch
View File

@ -13,7 +13,7 @@ diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index c806126..df59412 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -4,7 +4,7 @@ Version: 9.49.39
@@ -4,7 +4,7 @@ Version: 9.49.41
# ppp-watch is GPLv2+, everything else is GPLv2
License: GPLv2 and GPLv2+
Group: System Environment/Base
@ -22,7 +22,7 @@ index c806126..df59412 100644
URL: https://github.com/fedora-sysv/initscripts
Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -49,6 +49,7 @@ Patch6: dhclient-restrict-interfaces-to-those-on-c.patch
@@ -50,6 +50,7 @@ Patch6: dhclient-restrict-interfaces-to-those-on-c.patch
Patch7: support-interface-promisc.patch
Patch8: 0001-dhclient-remove-1-arg.patch
Patch9: 0001-force-delay-check-link-down.patch
@ -30,7 +30,7 @@ index c806126..df59412 100644
%description
The initscripts package contains basic system scripts used
@@ -75,6 +76,7 @@ Currently, this consists of various memory checking code.
@@ -76,6 +77,7 @@ Currently, this consists of various memory checking code.
%patch7 -p1
%patch8 -p1
%patch9 -p1

6
base/initscripts/centos/meta_patches/spec-add-mountnfs-init-script.patch
View File

@ -24,7 +24,7 @@ index 6ec4bea..5ba669b 100644
Requires: /bin/awk, sed, coreutils
Requires: /sbin/sysctl
Requires: grep
@@ -93,6 +96,11 @@ chmod 600 $RPM_BUILD_ROOT/etc/crypttab
@@ -94,6 +97,11 @@ chmod 600 $RPM_BUILD_ROOT/etc/crypttab
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/sysctl.conf
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/network
@ -36,7 +36,7 @@ index 6ec4bea..5ba669b 100644
%pre
/usr/sbin/groupadd -g 22 -r -f utmp
@@ -101,6 +109,7 @@ touch /var/log/wtmp /var/run/utmp /var/log/btmp
@@ -104,6 +112,7 @@ touch /var/log/wtmp /var/run/utmp /var/log/btmp
chown root:utmp /var/log/wtmp /var/run/utmp /var/log/btmp
chmod 664 /var/log/wtmp /var/run/utmp
chmod 600 /var/log/btmp
@ -44,7 +44,7 @@ index 6ec4bea..5ba669b 100644
/usr/sbin/chkconfig --add network
/usr/sbin/chkconfig --add netconsole
@@ -226,6 +235,8 @@ rm -rf $RPM_BUILD_ROOT
@@ -228,6 +237,8 @@ rm -rf $RPM_BUILD_ROOT
%ghost %{_localstatedir}/log/dmesg.old
# WRS
/etc/sysconfig/network

4
base/initscripts/centos/meta_patches/spec-sysconfig-affirmative-check-for-link-carrier.patch
View File

@ -12,7 +12,7 @@ diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index fd84a75..e3748e5 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -50,6 +50,7 @@ Patch7: support-interface-promisc.patch
@@ -51,6 +51,7 @@ Patch7: support-interface-promisc.patch
Patch8: 0001-dhclient-remove-1-arg.patch
Patch9: 0001-force-delay-check-link-down.patch
Patch10: run-ifdown-on-all-interfaces.patch
@ -20,7 +20,7 @@ index fd84a75..e3748e5 100644
%description
The initscripts package contains basic system scripts used
@@ -77,6 +78,7 @@ Currently, this consists of various memory checking code.
@@ -78,6 +79,7 @@ Currently, this consists of various memory checking code.
%patch8 -p1
%patch9 -p1
%patch10 -p1

4
base/initscripts/centos/meta_patches/spec-sysconfig-unsafe-usage-of-linkdelay-variable.patch
View File

@ -12,7 +12,7 @@ diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index e3748e5..f2d0271 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -51,6 +51,7 @@ Patch8: 0001-dhclient-remove-1-arg.patch
@@ -52,6 +52,7 @@ Patch8: 0001-dhclient-remove-1-arg.patch
Patch9: 0001-force-delay-check-link-down.patch
Patch10: run-ifdown-on-all-interfaces.patch
Patch11: sysconfig-affirmative-check-for-link-carrier.patch
@ -20,7 +20,7 @@ index e3748e5..f2d0271 100644
%description
The initscripts package contains basic system scripts used
@@ -79,6 +80,7 @@ Currently, this consists of various memory checking code.
@@ -80,6 +81,7 @@ Currently, this consists of various memory checking code.
%patch9 -p1
%patch10 -p1
%patch11 -p1

6
base/initscripts/centos/meta_patches/stop-creating-shared-dirs.patch
View File

@ -11,7 +11,7 @@ diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index 7f93a30..5349c54 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -176,10 +176,7 @@ rm -rf $RPM_BUILD_ROOT
@@ -178,10 +178,7 @@ rm -rf $RPM_BUILD_ROOT
/usr/lib/systemd/rhel-*
/usr/lib/systemd/system/*
/etc/inittab
@ -22,7 +22,7 @@ index 7f93a30..5349c54 100644
/etc/rc.d/init.d/*
%config(noreplace) /etc/sysctl.conf
/usr/lib/sysctl.d/00-system.conf
@@ -201,7 +198,6 @@ rm -rf $RPM_BUILD_ROOT
@@ -203,7 +200,6 @@ rm -rf $RPM_BUILD_ROOT
/usr/sbin/ppp-watch
%{_mandir}/man*/*
%dir %attr(775,root,root) /var/run/netreport
@ -30,7 +30,7 @@ index 7f93a30..5349c54 100644
%dir /etc/ppp/peers
/etc/ppp/ip-up
/etc/ppp/ip-down
@@ -209,8 +205,6 @@ rm -rf $RPM_BUILD_ROOT
@@ -211,8 +207,6 @@ rm -rf $RPM_BUILD_ROOT
/etc/ppp/ip-down.ipv6to4
/etc/ppp/ipv6-up
/etc/ppp/ipv6-down

2
base/initscripts/centos/patches/0001-dhclient-remove-1-arg.patch
View File

@ -11,7 +11,7 @@ diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup
index fdbbf13..439c4c5 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -195,7 +195,8 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then
@@ -212,7 +212,8 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then
generate_lease_file_name
# Initialize the dhclient args and obtain the hostname options if needed:

2
base/initscripts/centos/patches/0001-force-delay-check-link-down.patch
View File

@ -11,7 +11,7 @@ diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scr
index 080101b..798f28a 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -460,7 +460,7 @@ check_link_down ()
@@ -470,7 +470,7 @@ check_link_down ()
ip link set dev $1 up >/dev/null 2>&1
fi
timeout=0

8
base/initscripts/centos/patches/dhclient-restrict-interfaces-to-those-on-c.patch
View File

@ -29,7 +29,8 @@ diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/if
index 7ccbddf..5b75162 100755
--- a/sysconfig/network-scripts/ifdown-eth
+++ b/sysconfig/network-scripts/ifdown-eth
@@ -93,6 +93,6 @@ for VER in "" 6 ; do
@@ -92,7 +92,7 @@ for VER in "" 6 ; do
dhcpid=$(cat /var/run/dhclient$VER-${DEVICE}.pid)
generate_lease_file_name $VER
if is_true "$DHCPRELEASE"; then
- /sbin/dhclient -r -lf ${LEASEFILE} -pf /var/run/dhclient$VER-${DEVICE}.pid ${DEVICE} >/dev/null 2>&1
@ -41,7 +42,7 @@ diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup
index 3da5c16..9bcf57f 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -187,7 +187,7 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then
@@ -204,7 +204,7 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then
generate_lease_file_name
# Initialize the dhclient args and obtain the hostname options if needed:
@ -50,7 +51,8 @@ index 3da5c16..9bcf57f 100755
set_hostname_options DHCLIENTARGS
echo
@@ -333,6 +333,6 @@ if is_true "${DHCPV6C}" && [ -x /sbin/dhclient ]; then
@@ -354,7 +354,7 @@ if is_true "${DHCPV6C}" && [ -x /sbin/dhclient ]; then
echo -n $"Determining IPv6 information for ${DEVICE}..."
# Initialize the dhclient args for IPv6 and obtain the hostname options if needed:
- DHCLIENTARGS="-6 -1 ${DHCPV6C_OPTIONS} ${DHCLIENTCONF} -lf ${LEASEFILE} -pf /var/run/dhclient6-${DEVICE}.pid ${DEVICE}"

8
base/initscripts/centos/patches/ifup-eth-stop-waiting-if-link-is-up.patch
View File

@ -11,7 +11,7 @@ diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup
index 192ad18..4b8b992 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -151,7 +151,7 @@ if [ "$ISALIAS" = no ] && is_bonding_device ${DEVICE} ; then
@@ -168,7 +168,7 @@ if [ "$ISALIAS" = no ] && is_bonding_device ${DEVICE} ; then
/sbin/ifup ${device##*/} || net_log "Unable to start slave device ${device##*/} for master ${DEVICE}." warning
done
@ -20,7 +20,7 @@ index 192ad18..4b8b992 100755
# add the bits to setup the needed post enslavement parameters
for arg in $BONDING_OPTS ; do
@@ -171,7 +171,7 @@ if [ -n "${BRIDGE}" ] && [ -x /usr/sbin/brctl ]; then
@@ -188,7 +188,7 @@ if [ -n "${BRIDGE}" ] && [ -x /usr/sbin/brctl ]; then
/sbin/ip addr flush dev ${DEVICE} 2>/dev/null
/sbin/ip link set dev ${DEVICE} up
ethtool_set
@ -29,7 +29,7 @@ index 192ad18..4b8b992 100755
/usr/sbin/brctl addif -- ${BRIDGE} ${DEVICE}
# add the bits to setup driver parameters here
for arg in $BRIDGING_OPTS ; do
@@ -227,7 +227,7 @@ else
@@ -244,7 +244,7 @@ else
# enable device without IP, useful for e.g. PPPoE
ip link set dev ${REALDEVICE} up
ethtool_set
@ -38,7 +38,7 @@ index 192ad18..4b8b992 100755
else
expand_config
@@ -242,7 +242,7 @@ else
@@ -259,7 +259,7 @@ else
ethtool_set

2
base/initscripts/centos/patches/run-dhclient-as-daemon-for-ipv6.patch
View File

@ -11,7 +11,7 @@ diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup
index 4b8b992..ccb5c75 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -341,13 +341,14 @@ if is_true "${DHCPV6C}" && [ -x /sbin/dhclient ]; then
@@ -363,13 +363,14 @@ if is_true "${DHCPV6C}" && [ -x /sbin/dhclient ]; then
echo -n $"Determining IPv6 information for ${DEVICE}..."
# Initialize the dhclient args for IPv6 and obtain the hostname options if needed:

4
base/initscripts/centos/patches/support-interface-promisc.patch
View File

@ -26,7 +26,7 @@ diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup
index 9bcf57f..fdbbf13 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -111,6 +111,11 @@ if [ -n "${MTU}" ]; then
@@ -128,6 +128,11 @@ if [ -n "${MTU}" ]; then
ip link set dev ${DEVICE} mtu ${MTU}
fi
@ -38,7 +38,7 @@ index 9bcf57f..fdbbf13 100755
# is the device wireless? If so, configure wireless device specifics
is_wireless_device ${DEVICE} && . ./ifup-wireless
@@ -130,6 +135,9 @@ if [ "${SLAVE}" = yes -a "${ISALIAS}" = no -a "${MASTER}" != "" ]; then
@@ -147,6 +152,9 @@ if [ "${SLAVE}" = yes -a "${ISALIAS}" = no -a "${MASTER}" != "" ]; then
}
ethtool_set

4
base/initscripts/centos/patches/support-interface-scriptlets.patch
View File

@ -31,7 +31,7 @@ diff --git a/sysconfig/network-scripts/ifdown-post b/sysconfig/network-scripts/i
index 8b56e14..bd4198a 100755
--- a/sysconfig/network-scripts/ifdown-post
+++ b/sysconfig/network-scripts/ifdown-post
@@ -61,4 +61,16 @@ if [ -x /sbin/ifdown-local ]; then
@@ -69,4 +69,16 @@ if [ -x /sbin/ifdown-local ]; then
/sbin/ifdown-local ${DEVICE}
fi
@ -69,7 +69,7 @@ diff --git a/sysconfig/network-scripts/ifup-post b/sysconfig/network-scripts/ifu
index ab0710b..3b76492 100755
--- a/sysconfig/network-scripts/ifup-post
+++ b/sysconfig/network-scripts/ifup-post
@@ -117,4 +117,16 @@ if [ -x /sbin/ifup-local ]; then
@@ -148,4 +148,16 @@ if [ -x /sbin/ifup-local ]; then
/sbin/ifup-local ${DEVICE}
fi