From a423ebf9be2b41211e2feacf46d7c6d209109765 Mon Sep 17 00:00:00 2001 From: "Martin, Chen" Date: Tue, 25 Dec 2018 21:37:41 +0800 Subject: [PATCH] rebase initscript patch to CentOS 7.6 version Test: Pass build and multi-node deploy test Depends-On: https://review.openstack.org/627310 Story: 2004522 Task: 28403 Change-Id: Ic916370886b605758290e837a5a61f399db031c2 Signed-off-by: Martin, Chen --- ...01-Update-package-versioning-for-TIS-format.patch | 2 +- .../dhclient-restrict-interfaces-to-those-on-c.patch | 12 ++++++------ .../patches/run-dhclient-as-daemon-for-ipv6.patch | 2 +- .../patches/run-ifdown-on-all-interfaces.patch | 2 +- base/initscripts/centos/srpm_path | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/base/initscripts/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/initscripts/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index a142b3dda..a01cd0d22 100644 --- a/base/initscripts/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/base/initscripts/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -13,7 +13,7 @@ diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec index ad32f19..ace1326 100644 --- a/SPECS/initscripts.spec +++ b/SPECS/initscripts.spec -@@ -4,7 +4,7 @@ Version: 9.49.41 +@@ -4,7 +4,7 @@ Version: 9.49.46 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base diff --git a/base/initscripts/centos/patches/dhclient-restrict-interfaces-to-those-on-c.patch b/base/initscripts/centos/patches/dhclient-restrict-interfaces-to-those-on-c.patch index 6352036d0..79dc969e3 100644 --- a/base/initscripts/centos/patches/dhclient-restrict-interfaces-to-those-on-c.patch +++ b/base/initscripts/centos/patches/dhclient-restrict-interfaces-to-those-on-c.patch @@ -44,22 +44,22 @@ index 3da5c16..9bcf57f 100755 +++ b/sysconfig/network-scripts/ifup-eth @@ -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: - DHCLIENTARGS="${DHCLIENTARGS} ${ONESHOT} -q ${DHCLIENTCONF} -lf ${LEASEFILE} -pf /var/run/dhclient-${DEVICE}.pid" + DHCLIENTARGS="${DHCLIENTARGS} ${ONESHOT} -q ${DHCLIENTCONF} -lf ${LEASEFILE} --restrict-interfaces -pf /var/run/dhclient-${DEVICE}.pid" set_hostname_options DHCLIENTARGS - + echo -@@ -354,7 +354,7 @@ if is_true "${DHCPV6C}" && [ -x /sbin/dhclient ]; then +@@ -355,7 +355,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}" + DHCLIENTARGS="-6 -1 ${DHCPV6C_OPTIONS} ${DHCLIENTCONF} -lf ${LEASEFILE} --restrict-interfaces -pf /var/run/dhclient6-${DEVICE}.pid ${DEVICE}" set_hostname_options DHCLIENTARGS - + if /sbin/dhclient $DHCLIENTARGS; then --- +-- 1.9.1 diff --git a/base/initscripts/centos/patches/run-dhclient-as-daemon-for-ipv6.patch b/base/initscripts/centos/patches/run-dhclient-as-daemon-for-ipv6.patch index de69e7baf..ea638588d 100644 --- a/base/initscripts/centos/patches/run-dhclient-as-daemon-for-ipv6.patch +++ b/base/initscripts/centos/patches/run-dhclient-as-daemon-for-ipv6.patch @@ -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 -@@ -363,13 +363,14 @@ if is_true "${DHCPV6C}" && [ -x /sbin/dhclient ]; then +@@ -364,13 +364,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: diff --git a/base/initscripts/centos/patches/run-ifdown-on-all-interfaces.patch b/base/initscripts/centos/patches/run-ifdown-on-all-interfaces.patch index 30f40412a..2b4e9218d 100644 --- a/base/initscripts/centos/patches/run-ifdown-on-all-interfaces.patch +++ b/base/initscripts/centos/patches/run-ifdown-on-all-interfaces.patch @@ -11,7 +11,7 @@ diff --git a/rc.d/init.d/network b/rc.d/init.d/network index a8deed3..852ef94 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network -@@ -214,6 +214,9 @@ stop) +@@ -228,6 +228,9 @@ stop) if ! check_device_down $DEVICE; then action $"Shutting down interface $i: " ./ifdown $i boot [ $? -ne 0 ] && rc=1 diff --git a/base/initscripts/centos/srpm_path b/base/initscripts/centos/srpm_path index 1b314d583..f3a752297 100644 --- a/base/initscripts/centos/srpm_path +++ b/base/initscripts/centos/srpm_path @@ -1 +1 @@ -mirror:Source/initscripts-9.49.41-1.el7.src.rpm +mirror:Source/initscripts-9.49.46-1.el7.src.rpm