#1 Backport PR#301 from upstream
Closed 5 months ago by bstinson. Opened 8 months ago by dcavalca.
rpms/ dcavalca/initscripts c8s-pr301  into  c8s

@@ -0,0 +1,33 @@ 

+ From 55ee446c0715b013e6d54860ae65e55baf544dc3 Mon Sep 17 00:00:00 2001

+ From: Jan Macku <jamacku@redhat.com>

+ Date: Tue, 8 Jan 2019 17:23:13 +0100

+ Subject: [PATCH] Replace grep -EL with subshell since -L changed behaviour

+ 

+ Sugested by @lnykryn

+ Related to issue #300

+ ---

+  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 414bee06..bc5c1502 100755

+ --- a/etc/rc.d/init.d/network

+ +++ b/etc/rc.d/init.d/network

+ @@ -124,7 +124,7 @@ start)

+              continue

+          fi

+  

+ -        if LANG=C grep -EL "^ONBOOT=['\"]?[Nn][Oo]['\"]?" ifcfg-$i > /dev/null ; then

+ +        if ( . ./ifcfg-"$i" ; is_false "$ONBOOT" ) ; then

+              # this loads the module, to preserve ordering

+              is_available $i

+              continue

+ @@ -135,7 +135,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 ( . ./ifcfg-"$i" ; ! is_false "$ONBOOT" ) ; then

+              action $"Bringing up interface $i: " ./ifup $i boot

+              [ $? -ne 0 ] && rc=1

+          fi

file modified
+5 -2

@@ -19,7 +19,7 @@ 

  Name:             initscripts

  Summary:          Basic support for legacy System V init scripts

  Version:          10.00.6

- Release:          1%{?dist}

+ Release:          2%{?dist}

  

  License:          GPLv2

  

@@ -63,7 +63,7 @@ 

  

  # Upstream patches -- official upstream patches released by upstream since the

  # ----------------    last rebase that are necessary for any reason:

- #Patch000: example000.patch

+ Patch000: 55ee446c0715b013e6d54860ae65e55baf544dc3.patch

  

  

  # Downstream patches -- these should be always included when doing rebase:

@@ -344,6 +344,9 @@ 

  # =============================================================================

  

  %changelog

+ * Wed Apr 15 2020 Davide Cavalca <dcavalca@fb.com> - 10.00.6-2

+ - network-scripts: backport PR#301 (Replace grep -EL with subshell since -L changed behaviour)

+ 

  * Tue Dec 10 2019 Jan Macku <jamacku@redhat.com> - 10.00.6-1

  - Fix service network stop cmd

  - Fix missing python3 during build phase

Backport PR #301, which replaces a grep -EL invocation with a subshell for improved compatibility with grep >= 3.2 (see the upstream issue for more details). This PR has already been merged upstream.

This is resolved in initscripts-10.00.8-1.el8, which has been built for CentOS Stream and should make it into the next compose.

Pull-Request has been closed by bstinson

5 months ago