diff --git a/bugfix-network-check-val-of-the-grep.patch b/bugfix-network-check-val-of-the-grep.patch index f7c8f7b2b038ed2bbe0f177a5689eb456f9ee494..65dcd393f7c2e31eed1c11ca4114a5bf49aa8c05 100644 --- a/bugfix-network-check-val-of-the-grep.patch +++ b/bugfix-network-check-val-of-the-grep.patch @@ -1,17 +1,15 @@ -From df22ec994da59550f065dbd4bc6b554f789f3ed0 Mon Sep 17 00:00:00 2001 +From 8db1d31e6715dce9d34dbcaaa85b38646b2ec3d1 Mon Sep 17 00:00:00 2001 From: rpm-build -Date: Tue, 3 Mar 2020 11:49:58 +0800 -Subject: [PATCH] initscripts: adapt to GREP command line +Date: Thu, 5 Mar 2020 09:48:44 +0800 +Subject: [PATCH] initscripts:adapt to the grep command -Type:bugfix -CVE: Signed-off-by: zhanglu --- - etc/rc.d/init.d/network | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + etc/rc.d/init.d/network | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/rc.d/init.d/network b/etc/rc.d/init.d/network -index f69948e..069442f 100755 +index f69948e..9a0c3f3 100755 --- a/etc/rc.d/init.d/network +++ b/etc/rc.d/init.d/network @@ -132,7 +132,7 @@ start) @@ -23,6 +21,15 @@ index f69948e..069442f 100755 # this loads the module, to preserve ordering is_available $i continue +@@ -149,7 +149,7 @@ start) + + # Bring up xDSL and VPN interfaces + for i in $vlaninterfaces $bridgeinterfaces $xdslinterfaces $vpninterfaces ; do +- if ! LANG=C grep -EL "^ONBOOT=['\"]?[Nn][Oo]['\"]?" ifcfg-$i >/dev/null 2>&1 ; then ++ if LANG=C grep -EL "^ONBOOT=['\"]?[Nn][Oo]['\"]?" ifcfg-$i >/dev/null 2>&1 ; then + if [ "$godamon" != "1" ] ; then + action $"Bringing up interface $i: " ./ifup $i boot + [ $? -ne 0 ] && rc=1 -- 1.8.3.1 diff --git a/initscripts.spec b/initscripts.spec index f50d7de38c286e5af0bd1f58984a5199ef2a838c..43a3df49ce16b533afada85bc24bd6baee2560c6 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -20,7 +20,7 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts Version: 10.01 -Release: 5 +Release: 6 License: GPLv2 @@ -361,6 +361,12 @@ fi # ============================================================================= %changelog +* Thu Mar 5 2020 openEuler Buildteam - 10.01-6 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:adapt to the grep command line + * Tue Mar 3 2020 openEuler Buildteam - 10.01-5 - Type:bugfix - ID:NA