/[smeserver]/rpms/initscripts/sme9/0001-Fix-greps-to-correctly-handle-comments-and-quotation.patch
ViewVC logotype

Diff of /rpms/initscripts/sme9/0001-Fix-greps-to-correctly-handle-comments-and-quotation.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.1 by slords, Tue Mar 19 14:18:43 2013 UTC Revision 1.2 by slords, Tue Mar 19 14:21:58 2013 UTC
# Line 0  Line 1 
1    From 740589f809e39647da417d976c2fed2ad75ce1dd Mon Sep 17 00:00:00 2001
2    From: Lukas Nykryn <lnykryn@redhat.com>
3    Date: Tue, 26 Feb 2013 16:57:05 +0100
4    Subject: [PATCH] Fix greps to correctly handle comments and quotation
5     (#915659)
6    
7    ---
8     sysconfig/network-scripts/ifdown-eth        | 2 +-
9     sysconfig/network-scripts/ifup-eth          | 2 +-
10     sysconfig/network-scripts/network-functions | 2 +-
11     3 files changed, 3 insertions(+), 3 deletions(-)
12    
13    diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth
14    index f256d57..4b1dad7 100755
15    --- a/sysconfig/network-scripts/ifdown-eth
16    +++ b/sysconfig/network-scripts/ifdown-eth
17    @@ -53,7 +53,7 @@ fi
18     fi
19    
20     if is_bonding_device ${DEVICE} ; then
21    -    for device in $(LANG=C egrep -l "^[[:space:]]*MASTER=\"?${DEVICE}\"?[[:space:]]*$" /etc/sysconfig/network-scripts/ifcfg-*) ; do
22    +    for device in $(LANG=C grep -l "^[[:space:]]*MASTER=\"\?${DEVICE}\"\?\([[:space:]#]\|$\)" /etc/sysconfig/network-scripts/ifcfg-*) ; do
23            is_ignored_file "$device" && continue
24            /sbin/ifdown ${device##*/}
25         done
26    diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
27    index be225c8..f14f854 100755
28    --- a/sysconfig/network-scripts/ifup-eth
29    +++ b/sysconfig/network-scripts/ifup-eth
30    @@ -119,7 +119,7 @@ fi
31     # so it can actually get an IP.
32     if [ "$ISALIAS" = no ] && is_bonding_device ${DEVICE} ; then
33         install_bonding_driver ${DEVICE}
34    -    for device in $(LANG=C egrep -l "^[[:space:]]*MASTER=\"?${DEVICE}\"?[[:space:]]*$" /etc/sysconfig/network-scripts/ifcfg-*) ; do
35    +    for device in $(LANG=C grep -l "^[[:space:]]*MASTER=\"\?${DEVICE}\"\?\([[:space:]#]\|$\)" /etc/sysconfig/network-scripts/ifcfg-*) ; do
36                is_ignored_file "$device" && continue
37                /sbin/ifup ${device##*/}
38         done
39    diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
40    index b15028b..cb7c540 100644
41    --- a/sysconfig/network-scripts/network-functions
42    +++ b/sysconfig/network-scripts/network-functions
43    @@ -22,7 +22,7 @@ get_hwaddr ()
44    
45     get_config_by_device ()
46     {
47    -    LANG=C grep -l "^[[:space:]]*DEVICE=${1}\([[:space:]#]\|$\)" \
48    +    LANG=C grep -l "^[[:space:]]*DEVICE=\"\?${1}\"\?\([[:space:]#]\|$\)" \
49            /etc/sysconfig/network-scripts/ifcfg-* \
50            | LC_ALL=C sed -e "$__sed_discard_ignored_files"
51     }
52    --
53    1.8.1.2
54    

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed