starlingx/integ
Code Issues Proposed changes

rebase initscript patch to CentOS 7.6 version

Browse Source 
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 <haochuan.z.chen@intel.com>
This commit is contained in:
Martin, Chen 2018-12-25 21:37:41 +08:00 committed by chen haochuan
parent 2141fc213e
commit a423ebf9be
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@ diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index ad32f19..ace1326 100644 index ad32f19..ace1326 100644
--- a/SPECS/initscripts.spec --- a/SPECS/initscripts.spec
+++ b/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 # ppp-watch is GPLv2+, everything else is GPLv2
License: GPLv2 and GPLv2+ License: GPLv2 and GPLv2+
Group: System Environment/Base Group: System Environment/Base

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

@ -44,22 +44,22 @@ index 3da5c16..9bcf57f 100755
+++ b/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth
@@ -204,7 +204,7 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then @@ -204,7 +204,7 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then
generate_lease_file_name generate_lease_file_name
# Initialize the dhclient args and obtain the hostname options if needed: # 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} -pf /var/run/dhclient-${DEVICE}.pid"
+ DHCLIENTARGS="${DHCLIENTARGS} ${ONESHOT} -q ${DHCLIENTCONF} -lf ${LEASEFILE} --restrict-interfaces -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 set_hostname_options DHCLIENTARGS
echo 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}..." echo -n $"Determining IPv6 information for ${DEVICE}..."
# Initialize the dhclient args for IPv6 and obtain the hostname options if needed: # 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} -pf /var/run/dhclient6-${DEVICE}.pid ${DEVICE}"
+ DHCLIENTARGS="-6 -1 ${DHCPV6C_OPTIONS} ${DHCLIENTCONF} -lf ${LEASEFILE} --restrict-interfaces -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 set_hostname_options DHCLIENTARGS
if /sbin/dhclient $DHCLIENTARGS; then if /sbin/dhclient $DHCLIENTARGS; then
-- --
1.9.1 1.9.1

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 index 4b8b992..ccb5c75 100755
--- a/sysconfig/network-scripts/ifup-eth --- a/sysconfig/network-scripts/ifup-eth
+++ b/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}..." echo -n $"Determining IPv6 information for ${DEVICE}..."
# Initialize the dhclient args for IPv6 and obtain the hostname options if needed: # Initialize the dhclient args for IPv6 and obtain the hostname options if needed:

2
base/initscripts/centos/patches/run-ifdown-on-all-interfaces.patch
View File

@ -11,7 +11,7 @@ diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index a8deed3..852ef94 100755 index a8deed3..852ef94 100755
--- a/rc.d/init.d/network --- a/rc.d/init.d/network
+++ b/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 if ! check_device_down $DEVICE; then
action $"Shutting down interface $i: " ./ifdown $i boot action $"Shutting down interface $i: " ./ifdown $i boot
[ $? -ne 0 ] && rc=1 [ $? -ne 0 ] && rc=1

2
base/initscripts/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/initscripts-9.49.41-1.el7.src.rpm mirror:Source/initscripts-9.49.46-1.el7.src.rpm