starlingx/integ
Code Issues Proposed changes

CentOS 8: Upgrade initscripts to version 10.00.1-1.el8_0.1

Browse Source 
(1)Release Version Upgrade
(2)Matching code changes with el7 to el8

Story: 2006729
Task: 37669
Depends-On: https://review.opendev.org/#/c/696481/
Depends-On: https://review.opendev.org/#/c/696050/
Change-Id: I085c40a52d94ca38f63f2ff98db74149b750f922
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
This commit is contained in:
chendongqi 2019-11-26 10:05:23 +08:00
parent 9035cd1be8
commit e8910538de
16 changed files with 178 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/initscripts/centos/build_srpm.data
View File

@ -1 +1 @@
TIS_PATCH_VER=19 TIS_PATCH_VER=1

103
base/initscripts/centos/meta_patches/0001-Include-starlingx-initscripts-changes.patch
View File

@ -9,26 +9,27 @@ commit, and then the new meta-patch created from the output of
git format-patch HEAD~ git format-patch HEAD~
Signed-off-by: Joseph Richard <joseph.richard@windriver.com> Signed-off-by: Joseph Richard <joseph.richard@windriver.com>
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
--- ---
SPECS/initscripts.spec | 38 ++++++++++++++++++++++++++++++-------- SPECS/initscripts.spec | 19 +++++++++++++++----
1 file changed, 30 insertions(+), 8 deletions(-) 1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index fb0bd96..a446775 100644 index fb0bd96..a446775 100644
--- a/SPECS/initscripts.spec --- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec +++ b/SPECS/initscripts.spec
@@ -4,7 +4,7 @@ Version: 9.49.46 @@ -19,7 +19,7 @@ Requires: gawk \
# ppp-watch is GPLv2+, everything else is GPLv2 Name: initscripts
License: GPLv2 and GPLv2+ Summary: Basic support for legacy System V init scripts
Group: System Environment/Base Version: 10.00.1
-Release: 1%{?dist} -Release: 1%{?dist}.1
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver} +Release: 1.el8_0.1%{?_tis_dist}.%{tis_patch_ver}
URL: https://github.com/fedora-sysv/initscripts
Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz License: GPLv2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -36,6 +36,20 @@ Requires(preun): /sbin/chkconfig @@ -67,6 +67,20 @@ Obsoletes: %{name} < 9.82-2
BuildRequires: glib2-devel popt-devel gettext pkgconfig systemd Patch000: patch000-fix_escape_sequence_being_output_under_systemd_service_units.patch
Provides: /sbin/service Patch001: patch001-fix_missing_python3_during_build_phase.patch
+Patch1: support-interface-scriptlets.patch +Patch1: support-interface-scriptlets.patch
+Patch2: relocate-dhclient-leases-to-var-run.patch +Patch2: relocate-dhclient-leases-to-var-run.patch
@ -44,67 +45,19 @@ index fb0bd96..a446775 100644
+Patch12: ifup-alias-scope.patch +Patch12: ifup-alias-scope.patch
+Patch13: ifup-alias-check-ipaddr.patch +Patch13: ifup-alias-check-ipaddr.patch
+ +
%description # Downstream patches -- these should be always included when doing rebase:
The initscripts package contains basic system scripts used # ------------------
during a boot of the system. It also contains scripts which #Patch100: example100.patch
@@ -55,6 +69,20 @@ Currently, this consists of various memory checking code. @@ -266,9 +280,6 @@ fi
%prep
%setup -q
+%patch1 -p1 # NOTE: /etc/profile.d/ is owned by setup package.
+%patch2 -p1 # /etc/sysconfig/ is owned by filesystem package.
+%patch3 -p1 -%dir %{_sysconfdir}/rc.d
+%patch4 -p1 -%dir %{_sysconfdir}/rc.d/init.d
+%patch5 -p1 -%dir %{_sysconfdir}/rc.d/rc[0-6].d
+%patch6 -p1 %dir %{_sysconfdir}/sysconfig/console
+%patch7 -p1 %dir %{_sysconfdir}/sysconfig/modules
+%patch8 -p1 %dir %{_libexecdir}/%{name}
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+
%build
make
@@ -163,10 +191,7 @@ rm -rf $RPM_BUILD_ROOT
/usr/lib/systemd/rhel-*
/usr/lib/systemd/system/*
/etc/inittab
-%dir /etc/rc.d
-%dir /etc/rc.d/rc[0-9].d
/etc/rc[0-9].d
-%dir /etc/rc.d/init.d
/etc/rc.d/init.d/*
%config(noreplace) /etc/sysctl.conf
/usr/lib/sysctl.d/00-system.conf
@@ -188,7 +213,6 @@ rm -rf $RPM_BUILD_ROOT
/usr/sbin/ppp-watch
%{_mandir}/man*/*
%dir %attr(775,root,root) /var/run/netreport
-%dir /etc/ppp
%dir /etc/ppp/peers
/etc/ppp/ip-up
/etc/ppp/ip-down
@@ -196,8 +220,6 @@ rm -rf $RPM_BUILD_ROOT
/etc/ppp/ip-down.ipv6to4
/etc/ppp/ipv6-up
/etc/ppp/ipv6-down
-%dir /etc/NetworkManager
-%dir /etc/NetworkManager/dispatcher.d
/etc/NetworkManager/dispatcher.d/00-netreport
%doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING
%doc examples
@@ -207,7 +229,7 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%ghost %attr(0644,root,root) /etc/sysconfig/kvm
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab
-%dir /usr/lib/tmpfiles.d
+%dir %attr(0755,root,root) /usr/lib/tmpfiles.d
/usr/lib/tmpfiles.d/initscripts.conf
%dir /usr/libexec/initscripts
%dir /usr/libexec/initscripts/legacy-actions
-- --
1.8.3.1 2.7.4

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

@ -3,24 +3,25 @@ From: Ludovic Beliveau <ludovic.beliveau@windriver.com>
Date: Mon, 30 May 2016 10:12:43 -0400 Date: Mon, 30 May 2016 10:12:43 -0400
Subject: [PATCH 1/1] dhclient remove -1 arg Subject: [PATCH 1/1] dhclient remove -1 arg
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
--- ---
sysconfig/network-scripts/ifup-eth | 3 ++- network-scripts/ifup-eth | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth diff --git a/network-scripts/ifup-eth b/network-scripts/ifup-eth
index fdbbf13..439c4c5 100755 index fdbbf13..439c4c5 100755
--- a/sysconfig/network-scripts/ifup-eth --- a/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth +++ b/network-scripts/ifup-eth
@@ -212,7 +212,8 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then @@ -215,7 +215,8 @@ 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} --restrict-interfaces -pf /var/run/dhclient-${DEVICE}.pid" - DHCLIENTARGS="${DHCLIENTARGS} ${ONESHOT} -q ${DHCLIENTCONF} -lf ${LEASEFILE} --restrict-interfaces -pf /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 /run/dhclient-${DEVICE}.pid"
+ DHCLIENTARGS="${DHCLIENTARGS} ${DHCLIENTCONF} -lf ${LEASEFILE} --restrict-interfaces -pf /var/run/dhclient-${DEVICE}.pid" + DHCLIENTARGS="${DHCLIENTARGS} ${DHCLIENTCONF} -lf ${LEASEFILE} --restrict-interfaces -pf /run/dhclient-${DEVICE}.pid"
set_hostname_options DHCLIENTARGS set_hostname_options DHCLIENTARGS
echo echo
-- --
1.9.1 2.7.4

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

@ -3,15 +3,16 @@ From: Ludovic Beliveau <ludovic.beliveau@windriver.com>
Date: Thu, 9 Jun 2016 23:05:17 -0400 Date: Thu, 9 Jun 2016 23:05:17 -0400
Subject: [PATCH 1/1] force-delay-check-link-down Subject: [PATCH 1/1] force-delay-check-link-down
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
--- ---
sysconfig/network-scripts/network-functions | 2 +- network-scripts/network-functions | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions diff --git a/network-scripts/network-functions b/network-scripts/network-functions
index 080101b..798f28a 100644 index 080101b..798f28a 100644
--- a/sysconfig/network-scripts/network-functions --- a/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions +++ b/network-scripts/network-functions
@@ -470,7 +470,7 @@ check_link_down () @@ -456,7 +456,7 @@ check_link_down ()
ip link set dev $1 up >/dev/null 2>&1 ip link set dev $1 up >/dev/null 2>&1
fi fi
timeout=0 timeout=0
@ -21,5 +22,5 @@ index 080101b..798f28a 100644
while [ $timeout -le $delay ]; do while [ $timeout -le $delay ]; do
[ "$(cat /sys/class/net/$REALDEVICE/carrier 2>/dev/null)" != "0" ] && return 1 [ "$(cat /sys/class/net/$REALDEVICE/carrier 2>/dev/null)" != "0" ] && return 1
-- --
1.9.1 1.8.3.1

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

@ -20,46 +20,48 @@ at the command line.
To activate this change our version of ifup/ifdown has been modified to To activate this change our version of ifup/ifdown has been modified to
pass the "--restrict-interfaces" to dhclient as well as to request that each pass the "--restrict-interfaces" to dhclient as well as to request that each
process use its own lease file to avoid file corruption. process use its own lease file to avoid file corruption.
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
--- ---
sysconfig/network-scripts/ifdown-eth | 2 +- network-scripts/ifdown-eth | 2 +-
sysconfig/network-scripts/ifup-eth | 4 ++-- network-scripts/ifup-eth | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-) 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth diff --git a/network-scripts/ifdown-eth b/network-scripts/ifdown-eth
index 7ccbddf..5b75162 100755 index c610fd2..8a5fd04 100755
--- a/sysconfig/network-scripts/ifdown-eth --- a/network-scripts/ifdown-eth
+++ b/sysconfig/network-scripts/ifdown-eth +++ b/network-scripts/ifdown-eth
@@ -92,7 +92,7 @@ for VER in "" 6 ; do @@ -92,7 +92,7 @@ for VER in "" 6 ; do
dhcpid=$(cat /var/run/dhclient$VER-${DEVICE}.pid) dhcpid=$(cat /run/dhclient$VER-${DEVICE}.pid)
generate_lease_file_name $VER generate_lease_file_name $VER
if is_true "$DHCPRELEASE"; then if is_true "$DHCPRELEASE"; then
- /sbin/dhclient -r -lf ${LEASEFILE} -pf /var/run/dhclient$VER-${DEVICE}.pid ${DEVICE} >/dev/null 2>&1 - /sbin/dhclient -r -lf ${LEASEFILE} -pf /run/dhclient$VER-${DEVICE}.pid ${DEVICE} >/dev/null 2>&1
+ /sbin/dhclient -r -lf ${LEASEFILE} --restrict-interfaces -pf /var/run/dhclient$VER-${DEVICE}.pid ${DEVICE} >/dev/null 2>&1 + /sbin/dhclient -r -lf ${LEASEFILE} --restrict-interfaces -pf /run/dhclient$VER-${DEVICE}.pid ${DEVICE} >/dev/null 2>&1
retcode=$? retcode=$?
else else
kill $dhcpid >/dev/null 2>&1 kill $dhcpid >/dev/null 2>&1
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth diff --git a/network-scripts/ifup-eth b/network-scripts/ifup-eth
index 3da5c16..9bcf57f 100755 index b55db79..8a9d9d7 100755
--- a/sysconfig/network-scripts/ifup-eth --- a/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth +++ b/network-scripts/ifup-eth
@@ -204,7 +204,7 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then @@ -207,7 +207,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 /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 /run/dhclient-${DEVICE}.pid"
set_hostname_options DHCLIENTARGS set_hostname_options DHCLIENTARGS
echo echo
@@ -355,7 +355,7 @@ if is_true "${DHCPV6C}" && [ -x /sbin/dhclient ]; then @@ -358,7 +358,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 /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 /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.8.3.1

11
base/initscripts/centos/patches/ifup-alias-check-ipaddr.patch
View File

@ -1,16 +1,17 @@
From a45766732beaa475d48907824666e501bacc69db Mon Sep 17 00:00:00 2001 From a45766732beaa475d48907824666e501bacc69db Mon Sep 17 00:00:00 2001
From: Teresa Ho <teresa.ho@windriver.com> From: Teresa Ho <teresa.ho@windriver.com>
Date: Wed, 25 Sep 2019 15:56:36 -0400 Date: Wed, 25 Sep 2019 15:56:36 -0400
Subject: [PATCH 1/1] Patch14: ifup-alias-check-ipaddr Subject: [PATCH 1/1] ifup-alias-check-ipaddr
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
--- ---
sysconfig/network-scripts/ifup-aliases | 2 +- network-scripts/ifup-aliases | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sysconfig/network-scripts/ifup-aliases b/sysconfig/network-scripts/ifup-aliases diff --git a/network-scripts/ifup-aliases b/network-scripts/ifup-aliases
index 9086763..40454ed 100755 index 9086763..40454ed 100755
--- a/sysconfig/network-scripts/ifup-aliases --- a/network-scripts/ifup-aliases
+++ b/sysconfig/network-scripts/ifup-aliases +++ b/network-scripts/ifup-aliases
@@ -175,7 +175,7 @@ function new_interface () @@ -175,7 +175,7 @@ function new_interface ()
ipseen_${IPGLOP}=$FILE; devseen_${DEVNUM}=$FILE; ipseen_${IPGLOP}=$FILE; devseen_${DEVNUM}=$FILE;
"; ";

13
base/initscripts/centos/patches/ifup-alias-scope.patch
View File

@ -1,17 +1,18 @@
From 59e30a344df4b661f30c0a5c629dbd13e9d88e8f Mon Sep 17 00:00:00 2001 From 59e30a344df4b661f30c0a5c629dbd13e9d88e8f Mon Sep 17 00:00:00 2001
From: Teresa Ho <teresa.ho@windriver.com> From: Teresa Ho <teresa.ho@windriver.com>
Date: Mon, 17 Dec 2018 17:47:18 -0500 Date: Mon, 17 Dec 2018 17:47:18 -0500
Subject: [PATCH 1/1] WRS: Patch13: ifup-alias-scope.patch Subject: [PATCH 1/1] ifup-alias-scope.patch
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
--- ---
sysconfig/network-scripts/ifup-aliases | 8 +++++++- network-scripts/ifup-aliases | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-) 1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/sysconfig/network-scripts/ifup-aliases b/sysconfig/network-scripts/ifup-aliases diff --git a/network-scripts/ifup-aliases b/network-scripts/ifup-aliases
index 52d43ea..9086763 100755 index 52d43ea..9086763 100755
--- a/sysconfig/network-scripts/ifup-aliases --- a/network-scripts/ifup-aliases
+++ b/sysconfig/network-scripts/ifup-aliases +++ b/network-scripts/ifup-aliases
@@ -277,8 +277,14 @@ function new_interface () @@ -275,8 +275,14 @@ function new_interface ()
fi fi
fi fi

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

@ -3,15 +3,16 @@ From: Denny Khoerniawan <denny.khoerniawan@windriver.com>
Date: Wed, 15 Nov 2017 14:02:49 -0500 Date: Wed, 15 Nov 2017 14:02:49 -0500
Subject: [PATCH] ifup-eth stop waiting if link is up Subject: [PATCH] ifup-eth stop waiting if link is up
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
--- ---
sysconfig/network-scripts/ifup-eth | 8 ++++---- network-scripts/ifup-eth | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-) 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth diff --git a/network-scripts/ifup-eth b/network-scripts/ifup-eth
index 192ad18..4b8b992 100755 index 192ad18..4b8b992 100755
--- a/sysconfig/network-scripts/ifup-eth --- a/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth +++ b/network-scripts/ifup-eth
@@ -168,7 +168,7 @@ if [ "$ISALIAS" = no ] && is_bonding_device ${DEVICE} ; then @@ -171,7 +171,7 @@ if [ "$ISALIAS" = no ] && is_bonding_device ${DEVICE} ; then
/sbin/ifup ${device##*/} || net_log "Unable to start slave device ${device##*/} for master ${DEVICE}." warning /sbin/ifup ${device##*/} || net_log "Unable to start slave device ${device##*/} for master ${DEVICE}." warning
done done
@ -20,16 +21,16 @@ index 192ad18..4b8b992 100755
# add the bits to setup the needed post enslavement parameters # add the bits to setup the needed post enslavement parameters
for arg in $BONDING_OPTS ; do for arg in $BONDING_OPTS ; do
@@ -188,7 +188,7 @@ if [ -n "${BRIDGE}" ] && [ -x /usr/sbin/brctl ]; then @@ -191,7 +191,7 @@ if [ -n "${BRIDGE}" ]; then
/sbin/ip addr flush dev ${DEVICE} 2>/dev/null /sbin/ip addr flush dev ${DEVICE} 2>/dev/null
/sbin/ip link set dev ${DEVICE} up /sbin/ip link set dev ${DEVICE} up
ethtool_set ethtool_set
- [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY} - [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY}
+ check_link_down ${DEVICE} + check_link_down ${DEVICE}
/usr/sbin/brctl addif -- ${BRIDGE} ${DEVICE} ip link set ${DEVICE} master ${BRIDGE}
# add the bits to setup driver parameters here # add the bits to setup driver parameters here
for arg in $BRIDGING_OPTS ; do for arg in $BRIDGING_OPTS ; do
@@ -244,7 +244,7 @@ else @@ -247,7 +247,7 @@ else
# enable device without IP, useful for e.g. PPPoE # enable device without IP, useful for e.g. PPPoE
ip link set dev ${REALDEVICE} up ip link set dev ${REALDEVICE} up
ethtool_set ethtool_set
@ -38,7 +39,7 @@ index 192ad18..4b8b992 100755
else else
expand_config expand_config
@@ -259,7 +259,7 @@ else @@ -262,7 +262,7 @@ else
ethtool_set ethtool_set
@ -48,5 +49,5 @@ index 192ad18..4b8b992 100755
if [ "${DEVICE}" = "lo" ]; then if [ "${DEVICE}" = "lo" ]; then
SCOPE="scope host" SCOPE="scope host"
-- --
1.8.3.1 2.7.4

9
base/initscripts/centos/patches/ipv6-static-route-support.patch
View File

@ -3,14 +3,15 @@ From: Kevin Smith <kevin.smith@windriver.com>
Date: Tue, 17 Oct 2017 10:46:00 -0500 Date: Tue, 17 Oct 2017 10:46:00 -0500
Subject: [PATCH 1/1] ipv6 static route support Subject: [PATCH 1/1] ipv6 static route support
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
--- ---
sysconfig/network-scripts/ifup-routes | 4 +++- network-scripts/ifup-routes | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-) 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sysconfig/network-scripts/ifup-routes b/sysconfig/network-scripts/ifup-routes diff --git a/network-scripts/ifup-routes b/network-scripts/ifup-routes
index ff8d5b5..a82d053 100755 index ff8d5b5..a82d053 100755
--- a/sysconfig/network-scripts/ifup-routes --- a/network-scripts/ifup-routes
+++ b/sysconfig/network-scripts/ifup-routes +++ b/network-scripts/ifup-routes
@@ -32,9 +32,11 @@ handle_ip_file() { @@ -32,9 +32,11 @@ handle_ip_file() {
if [ "$type" != "$t" ]; then if [ "$type" != "$t" ]; then
proto="-6" proto="-6"

13
base/initscripts/centos/patches/relocate-dhclient-leases-to-var-run.patch
View File

@ -1,16 +1,17 @@
From 6a3a3047ad47570ccdb9b758c8417a66447be697 Mon Sep 17 00:00:00 2001 From 6a3a3047ad47570ccdb9b758c8417a66447be697 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com> From: Scott Little <scott.little@windriver.com>
Date: Thu, 5 Oct 2017 12:31:18 -0400 Date: Thu, 5 Oct 2017 12:31:18 -0400
Subject: [PATCH 2/9] WRS: Patch5-relocate-dhclient-leases-to-var-run.patch Subject: [PATCH 2/9] relocate-dhclient-leases-to-var-run.patch
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
--- ---
sysconfig/network-scripts/network-functions | 4 ++-- network-scripts/network-functions | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions diff --git a/network-scripts/network-functions b/network-scripts/network-functions
index 1867c38..080101b 100644 index 1867c38..080101b 100644
--- a/sysconfig/network-scripts/network-functions --- a/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions +++ b/network-scripts/network-functions
@@ -65,11 +65,11 @@ get_uuid_by_config () @@ -65,11 +65,11 @@ get_uuid_by_config ()
generate_lease_file_name () generate_lease_file_name ()
{ {
@ -26,5 +27,5 @@ index 1867c38..080101b 100644
generate_config_file_name () generate_config_file_name ()
-- --
1.9.1 1.8.3.1

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

@ -1,17 +1,18 @@
From 76a5f892c132eed05a6cbffbdba3306e50b6a672 Mon Sep 17 00:00:00 2001 From 76a5f892c132eed05a6cbffbdba3306e50b6a672 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com> From: Scott Little <scott.little@windriver.com>
Date: Thu, 5 Oct 2017 12:40:38 -0400 Date: Thu, 5 Oct 2017 12:40:38 -0400
Subject: [PATCH 7/9] WRS: Patch10-run-ifdown-on-all-interfaces.patch Subject: [PATCH 7/9] run-ifdown-on-all-interfaces.patch
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
--- ---
rc.d/init.d/network | 3 +++ etc/rc.d/init.d/network | 3 +++
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+)
diff --git a/rc.d/init.d/network b/rc.d/init.d/network diff --git a/etc/rc.d/init.d/network b/etc/rc.d/init.d/network
index a8deed3..852ef94 100755 index a8deed3..852ef94 100755
--- a/rc.d/init.d/network --- a/etc/rc.d/init.d/network
+++ b/rc.d/init.d/network +++ b/etc/rc.d/init.d/network
@@ -228,6 +228,9 @@ stop) @@ -232,6 +232,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
@ -22,5 +23,5 @@ index a8deed3..852ef94 100755
) )
done done
-- --
1.9.1 1.8.3.1

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

@ -1,36 +1,37 @@
From f50fd7a0a9b53ba475d85670a5428876e13dac36 Mon Sep 17 00:00:00 2001 From f50fd7a0a9b53ba475d85670a5428876e13dac36 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com> From: Scott Little <scott.little@windriver.com>
Date: Thu, 5 Oct 2017 12:37:06 -0400 Date: Thu, 5 Oct 2017 12:37:06 -0400
Subject: [PATCH 4/9] WRS: Patch7-support-interface-promisc.patch Subject: [PATCH 4/9] support-interface-promisc.patch
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
--- ---
sysconfig/network-scripts/ifdown-eth | 5 +++++ network-scripts/ifdown-eth | 5 +++++
sysconfig/network-scripts/ifup-eth | 8 ++++++++ network-scripts/ifup-eth | 8 ++++++++
2 files changed, 13 insertions(+) 2 files changed, 13 insertions(+)
diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth diff --git a/network-scripts/ifdown-eth b/network-scripts/ifdown-eth
index 5b75162..60f1ba2 100755 index 5b75162..60f1ba2 100755
--- a/sysconfig/network-scripts/ifdown-eth --- a/network-scripts/ifdown-eth
+++ b/sysconfig/network-scripts/ifdown-eth +++ b/network-scripts/ifdown-eth
@@ -181,4 +181,9 @@ if [ -n "$VLAN" ]; then @@ -180,4 +180,9 @@ if [ -n "$VLAN" ]; then
fi fi
fi fi
+# WRS: Support PROMISC +# Support PROMISC
+if [ "${PROMISC}" = yes ]; then +if [ "${PROMISC}" = yes ]; then
+ ip link set dev ${DEVICE} promisc off + ip link set dev ${DEVICE} promisc off
+fi +fi
+ +
exit $retcode exit $retcode
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth diff --git a/network-scripts/ifup-eth b/network-scripts/ifup-eth
index 9bcf57f..fdbbf13 100755 index 9bcf57f..fdbbf13 100755
--- a/sysconfig/network-scripts/ifup-eth --- a/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth +++ b/network-scripts/ifup-eth
@@ -128,6 +128,11 @@ if [ -n "${MTU}" ]; then @@ -131,6 +131,11 @@ if [ -n "${MTU}" ]; then
ip link set dev ${DEVICE} mtu ${MTU} ip link set dev ${DEVICE} mtu ${MTU}
fi fi
+# WRS: Support PROMISC +# Support PROMISC
+if [ "${PROMISC}" = yes ]; then +if [ "${PROMISC}" = yes ]; then
+ ip link set dev ${DEVICE} promisc on + ip link set dev ${DEVICE} promisc on
+fi +fi
@ -38,16 +39,16 @@ index 9bcf57f..fdbbf13 100755
# is the device wireless? If so, configure wireless device specifics # is the device wireless? If so, configure wireless device specifics
is_wireless_device ${DEVICE} && . ./ifup-wireless is_wireless_device ${DEVICE} && . ./ifup-wireless
@@ -147,6 +152,9 @@ if [ "${SLAVE}" = yes -a "${ISALIAS}" = no -a "${MASTER}" != "" ]; then @@ -150,6 +155,9 @@ if [ "${SLAVE}" = yes -a "${ISALIAS}" = no -a "${MASTER}" != "" ]; then
} }
ethtool_set ethtool_set
+ # WRS: Flush addresses + # Flush addresses
+ ip addr flush dev ${DEVICE} + ip addr flush dev ${DEVICE}
+ +
exit 0 exit 0
fi fi
-- --
1.9.1 1.8.3.1

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

@ -1,24 +1,25 @@
From b5fb31139b18385f295debe8acdb25c23b6f8b87 Mon Sep 17 00:00:00 2001 From b5fb31139b18385f295debe8acdb25c23b6f8b87 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com> From: Scott Little <scott.little@windriver.com>
Date: Thu, 5 Oct 2017 12:30:03 -0400 Date: Thu, 5 Oct 2017 12:30:03 -0400
Subject: [PATCH 1/9] WRS: Patch4-support-interface-scriptlets.patch Subject: [PATCH 1/9] support-interface-scriptlets.patch
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
--- ---
sysconfig/network-scripts/ifdown | 6 ++++++ network-scripts/ifdown | 6 ++++++
sysconfig/network-scripts/ifdown-post | 12 ++++++++++++ network-scripts/ifdown-post | 12 ++++++++++++
sysconfig/network-scripts/ifup | 6 ++++++ network-scripts/ifup | 6 ++++++
sysconfig/network-scripts/ifup-post | 12 ++++++++++++ network-scripts/ifup-post | 12 ++++++++++++
4 files changed, 36 insertions(+) 4 files changed, 36 insertions(+)
diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown diff --git a/network-scripts/ifdown b/network-scripts/ifdown
index 90b1c83..88c1d74 100755 index 90b1c83..88c1d74 100755
--- a/sysconfig/network-scripts/ifdown --- a/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown +++ b/network-scripts/ifdown
@@ -58,6 +58,12 @@ if [ -x /sbin/ifdown-pre-local ]; then @@ -64,6 +64,12 @@ if [ -x /sbin/ifdown-pre-local ]; then
/sbin/ifdown-pre-local ${DEVICE} /sbin/ifdown-pre-local ${DEVICE}
fi fi
+# WRS: Execute pre-down commands. +# Execute pre-down commands.
+if [ -n "$pre_down" ]; then +if [ -n "$pre_down" ]; then
+ eval $pre_down + eval $pre_down
+ [ "$?" != "0" ] && exit 1 + [ "$?" != "0" ] && exit 1
@ -27,36 +28,36 @@ index 90b1c83..88c1d74 100755
OTHERSCRIPT="/etc/sysconfig/network-scripts/ifdown-${DEVICETYPE}" OTHERSCRIPT="/etc/sysconfig/network-scripts/ifdown-${DEVICETYPE}"
if [ ! -x ${OTHERSCRIPT} ]; then if [ ! -x ${OTHERSCRIPT} ]; then
diff --git a/sysconfig/network-scripts/ifdown-post b/sysconfig/network-scripts/ifdown-post diff --git a/network-scripts/ifdown-post b/network-scripts/ifdown-post
index 8b56e14..bd4198a 100755 index 8b56e14..bd4198a 100755
--- a/sysconfig/network-scripts/ifdown-post --- a/network-scripts/ifdown-post
+++ b/sysconfig/network-scripts/ifdown-post +++ b/network-scripts/ifdown-post
@@ -69,4 +69,16 @@ if [ -x /sbin/ifdown-local ]; then @@ -66,4 +66,16 @@ if [ -x /sbin/ifdown-local ]; then
/sbin/ifdown-local ${DEVICE} /sbin/ifdown-local ${DEVICE}
fi fi
+# WRS: Execute down commands. +# Execute down commands.
+if [ -n "$down" ]; then +if [ -n "$down" ]; then
+ eval $down + eval $down
+ [ "$?" != "0" ] && exit 1 + [ "$?" != "0" ] && exit 1
+fi +fi
+ +
+# WRS: Execute post-down commands. +# Execute post-down commands.
+if [ -n "$post_down" ]; then +if [ -n "$post_down" ]; then
+ eval $post_down + eval $post_down
+ [ "$?" != "0" ] && exit 1 + [ "$?" != "0" ] && exit 1
+fi +fi
+ +
exit 0 exit 0
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup diff --git a/network-scripts/ifup b/network-scripts/ifup
index d25db5a..07c63a5 100755 index d25db5a..07c63a5 100755
--- a/sysconfig/network-scripts/ifup --- a/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup +++ b/network-scripts/ifup
@@ -151,6 +151,12 @@ if [ -x /sbin/ifup-pre-local ]; then @@ -157,6 +157,12 @@ if [ -x /sbin/ifup-pre-local ]; then
/sbin/ifup-pre-local ${CONFIG} $2 /sbin/ifup-pre-local ${CONFIG} $2
fi fi
+# WRS: Execute pre-up commands. +# Execute pre-up commands.
+if [ -n "$pre_up" ]; then +if [ -n "$pre_up" ]; then
+ eval $pre_up + eval $pre_up
+ [ "$?" != "0" ] && exit 1 + [ "$?" != "0" ] && exit 1
@ -65,21 +66,21 @@ index d25db5a..07c63a5 100755
OTHERSCRIPT="/etc/sysconfig/network-scripts/ifup-${DEVICETYPE}" OTHERSCRIPT="/etc/sysconfig/network-scripts/ifup-${DEVICETYPE}"
if [ ! -x ${OTHERSCRIPT} ]; then if [ ! -x ${OTHERSCRIPT} ]; then
diff --git a/sysconfig/network-scripts/ifup-post b/sysconfig/network-scripts/ifup-post diff --git a/network-scripts/ifup-post b/network-scripts/ifup-post
index ab0710b..3b76492 100755 index ab0710b..3b76492 100755
--- a/sysconfig/network-scripts/ifup-post --- a/network-scripts/ifup-post
+++ b/sysconfig/network-scripts/ifup-post +++ b/network-scripts/ifup-post
@@ -148,4 +148,16 @@ if [ -x /sbin/ifup-local ]; then @@ -145,4 +145,16 @@ if [ -x /sbin/ifup-local ]; then
/sbin/ifup-local ${DEVICE} /sbin/ifup-local ${DEVICE}
fi fi
+# WRS: Execute up commands. +# Execute up commands.
+if [ -n "$up" ]; then +if [ -n "$up" ]; then
+ eval $up + eval $up
+ [ "$?" != "0" ] && exit 1 + [ "$?" != "0" ] && exit 1
+fi +fi
+ +
+# WRS: Execute post-up commands. +# Execute post-up commands.
+if [ -n "$post_up" ]; then +if [ -n "$post_up" ]; then
+ eval $post_up + eval $post_up
+ [ "$?" != "0" ] && exit 1 + [ "$?" != "0" ] && exit 1
@ -87,5 +88,5 @@ index ab0710b..3b76492 100755
+ +
exit 0 exit 0
-- --
1.9.1 1.8.3.1

13
base/initscripts/centos/patches/sysconfig-affirmative-check-for-link-carrier.patch
View File

@ -20,15 +20,16 @@ To avoid this scenario we are changing this to a more affirmative check so that
it won't actually pass until stdout returns "1". it won't actually pass until stdout returns "1".
Signed-off-by: Allain Legacy <allain.legacy@windriver.com> Signed-off-by: Allain Legacy <allain.legacy@windriver.com>
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
--- ---
sysconfig/network-scripts/network-functions | 2 +- network-scripts/network-functions | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions diff --git a/network-scripts/network-functions b/network-scripts/network-functions
index d08f618..13cf4de 100644 index d08f618..13cf4de 100644
--- a/sysconfig/network-scripts/network-functions --- a/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions +++ b/network-scripts/network-functions
@@ -473,7 +473,7 @@ check_link_down () @@ -459,7 +459,7 @@ check_link_down ()
delay=20 delay=20
[ -n "$LINKDELAY" ] && delay=$(($LINKDELAY * 2)) [ -n "$LINKDELAY" ] && delay=$(($LINKDELAY * 2))
while [ $timeout -le $delay ]; do while [ $timeout -le $delay ]; do
@ -38,5 +39,5 @@ index d08f618..13cf4de 100644
timeout=$((timeout+1)) timeout=$((timeout+1))
done done
-- --
2.7.4 1.8.3.1

13
base/initscripts/centos/patches/sysconfig-unsafe-usage-of-linkdelay-variable.patch
View File

@ -11,15 +11,16 @@ down.
This does not address but is related to CGTS-5821 This does not address but is related to CGTS-5821
Signed-off-by: Allain Legacy <allain.legacy@windriver.com> Signed-off-by: Allain Legacy <allain.legacy@windriver.com>
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
--- ---
sysconfig/network-scripts/network-functions | 2 +- network-scripts/network-functions | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions diff --git a/network-scripts/network-functions b/network-scripts/network-functions
index 13cf4de..4bcc48f 100644 index 13cf4de..4bcc48f 100644
--- a/sysconfig/network-scripts/network-functions --- a/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions +++ b/network-scripts/network-functions
@@ -471,7 +471,7 @@ check_link_down () @@ -457,7 +457,7 @@ check_link_down ()
fi fi
timeout=0 timeout=0
delay=20 delay=20
@ -29,5 +30,5 @@ index 13cf4de..4bcc48f 100644
[ "$(cat /sys/class/net/$REALDEVICE/carrier 2>/dev/null)" == "1" ] && return 1 [ "$(cat /sys/class/net/$REALDEVICE/carrier 2>/dev/null)" == "1" ] && return 1
sleep 0.5 sleep 0.5
-- --
2.7.4 1.8.3.1

2
base/initscripts/centos/srpm_path
View File

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