initscript: adapt to the grep command.

Type:bugfix
Signed-off-by: zhanglu <zhanglu37@huawei.com>
This commit is contained in:
Anonymous_Z 2020-03-03 14:10:49 +08:00
parent 075d855b82
commit 8ee30d59d6
2 changed files with 36 additions and 1 deletions

View File

@ -0,0 +1,28 @@
From df22ec994da59550f065dbd4bc6b554f789f3ed0 Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Tue, 3 Mar 2020 11:49:58 +0800
Subject: [PATCH] initscripts: adapt to GREP command line
Type:bugfix
CVE:
Signed-off-by: zhanglu <zhanglu37@huawei.com>
---
etc/rc.d/init.d/network | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/etc/rc.d/init.d/network b/etc/rc.d/init.d/network
index f69948e..069442f 100755
--- a/etc/rc.d/init.d/network
+++ b/etc/rc.d/init.d/network
@@ -132,7 +132,7 @@ start)
continue
fi
- if LANG=C grep -EL "^ONBOOT=['\"]?[Nn][Oo]['\"]?" ifcfg-$i > /dev/null ; then
+ if ! LANG=C grep -EL "^ONBOOT=['\"]?[Nn][Oo]['\"]?" ifcfg-$i > /dev/null ; then
# this loads the module, to preserve ordering
is_available $i
continue
--
1.8.3.1

View File

@ -20,7 +20,7 @@ Requires: gawk \
Name: initscripts
Summary: Basic support for legacy System V init scripts
Version: 10.01
Release: 4
Release: 5
License: GPLv2
@ -94,6 +94,7 @@ Patch9004: bugfix-network-need-chkconfig-on.patch
Patch9005: bugfix-restart-network-warning.patch
Patch9006: new-network-fork-to-start-dhcp.patch
Patch9007: exec-udevadm-settle-when-network-start.patch
Patch9008: bugfix-network-check-val-of-the-grep.patch
%description
This package provides basic support for legacy System V init scripts, and some
@ -360,6 +361,12 @@ fi
# =============================================================================
%changelog
* Tue Mar 3 2020 openEuler Buildteam <buildteam@openeuler.org> - 10.01-5
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:adapt to the grep command line
* Mon Dec 16 2019 openEuler Buildteam <buildteam@openeuler.org> - 10.01-4
- Type:bugfix
- ID:NA