Attachment 205581 Details for Bug 220087 – updated diff

[patch] updated diff

diff (text/plain), 4.43 KB, created by Bill Nottingham on 2007-09-25 15:04:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bill Nottingham

Created: 2007-09-25 15:04:10 UTC

Size: 4.43 KB

patch

obsolete

>Index: rc.d/init.d/netconsole
>===================================================================
>RCS file: /usr/local/CVS/initscripts/rc.d/init.d/netconsole,v
>retrieving revision 1.3
>diff -u -r1.3 netconsole
>--- rc.d/init.d/netconsole	7 Aug 2007 15:31:49 -0000	1.3
>+++ rc.d/init.d/netconsole	25 Sep 2007 14:50:16 -0000
>@@ -67,7 +67,8 @@
> 	SYSLOGOPTS=
> 	# syslogd server, if any
> 	if [ -n "$SYSLOGADDR" ]; then
>-		if ! [[ "$SYSLOGADDR" =~ "^([0-9]{1,3}\.){3}[0-9]{1,3}$" ]]; then
>+		MATCH="^([0-9]{1,3}\.){3}[0-9]{1,3}$"
>+		if ! [[ "$SYSLOGADDR" =~ $MATCH ]]; then
> 			SYSLOGADDR=$(LANG=C host $SYSLOGADDR 2>/dev/null | awk '/has address / { print $NF }')
> 		fi
> 	fi
>Index: sysconfig/network-scripts/ifdown-routes
>===================================================================
>RCS file: /usr/local/CVS/initscripts/sysconfig/network-scripts/ifdown-routes,v
>retrieving revision 1.1
>diff -u -r1.1 ifdown-routes
>--- sysconfig/network-scripts/ifdown-routes	10 Jul 2006 22:12:21 -0000	1.1
>+++ sysconfig/network-scripts/ifdown-routes	25 Sep 2007 14:50:16 -0000
>@@ -9,6 +9,8 @@
> # The routes are actually dropped just by setting the link down, so nothing
> # needs to be done
> 
>+MATCH='^[[:space:]]*(\#.*)?$'
>+
> # Routing rules
> FILES="/etc/sysconfig/network-scripts/rule-$1"
> if [ -n "$2" -a "$2" != "$1" ]; then
>@@ -18,7 +20,7 @@
> for file in $FILES; do
>    if [ -f "$file" ]; then
>        { cat "$file" ; echo ; } | while read line; do
>-	   if [[ ! "$line" =~ '^[[:space:]]*(\#.*)?$' ]]; then
>+	   if [[ ! "$line" =~ $MATCH ]]; then
> 	       /sbin/ip rule del $line
> 	   fi
>        done
>Index: sysconfig/network-scripts/ifup
>===================================================================
>RCS file: /usr/local/CVS/initscripts/sysconfig/network-scripts/ifup,v
>retrieving revision 1.194
>diff -u -r1.194 ifup
>--- sysconfig/network-scripts/ifup	3 Aug 2007 20:08:11 -0000	1.194
>+++ sysconfig/network-scripts/ifup	25 Sep 2007 14:50:16 -0000
>@@ -68,11 +68,13 @@
> # Ethernet 802.1Q VLAN support
> if [ -x /sbin/vconfig -a "${VLAN}" = "yes" -a "$ISALIAS" = "no" ]; then
>     VID=""
>-    if [[ "${DEVICE}" =~ '^(eth|bond)[0-9]+\.[0-9]{1,4}$' ]]; then
>+    MATCH='^(eth|bond)[0-9]+\.[0-9]{1,4}$'
>+    if [[ "${DEVICE}" =~ $MATCH ]]; then
> 	VID=$(echo "${DEVICE}" | LC_ALL=C sed 's/^[a-z0-9]*\.0*//')
> 	PHYSDEV=${DEVICE%.*}
>     fi
>-    if [[ "${DEVICE}" =~ '^vlan[0-9]{1,4}?' ]]; then
>+    MATCH='^vlan[0-9]{1,4}?'
>+    if [[ "${DEVICE}" =~ $MATCH ]]; then
> 	VID=$(echo "${DEVICE}" | LC_ALL=C sed 's/^vlan0*//')
> 	# PHYSDEV should be set in ifcfg-vlan* file
> 	if test -z "$PHYSDEV"; then
>Index: sysconfig/network-scripts/ifup-aliases
>===================================================================
>RCS file: /usr/local/CVS/initscripts/sysconfig/network-scripts/ifup-aliases,v
>retrieving revision 1.46
>diff -u -r1.46 ifup-aliases
>--- sysconfig/network-scripts/ifup-aliases	11 Sep 2006 17:15:01 -0000	1.46
>+++ sysconfig/network-scripts/ifup-aliases	25 Sep 2007 14:50:16 -0000
>@@ -167,7 +167,8 @@
>        IPGLOP="${ipa%%.*}_${ipb%%.*}_${ipc%%.*}_${ipc#*.}";
>        DEVNUM=${DEVICE#*:}
> 
>-       if (LC_ALL=C; [[ ! "$DEVNUM" =~ '^[0-9A-Za-z_]*$' ]]); then
>+       MATCH='^[0-9A-Za-z_]*$'
>+       if (LC_ALL=C; [[ ! "$DEVNUM" =~ $MATCH ]]); then
> 	      echo $"error in $FILE: invalid alias number" >&2
> 	      return 1
>        fi
>Index: sysconfig/network-scripts/ifup-routes
>===================================================================
>RCS file: /usr/local/CVS/initscripts/sysconfig/network-scripts/ifup-routes,v
>retrieving revision 1.34
>diff -u -r1.34 ifup-routes
>--- sysconfig/network-scripts/ifup-routes	24 Jul 2006 15:01:33 -0000	1.34
>+++ sysconfig/network-scripts/ifup-routes	25 Sep 2007 14:50:16 -0000
>@@ -26,6 +26,8 @@
>     FILES="$FILES /etc/sysconfig/network-scripts/route-$2"
> fi
> 
>+MATCH='^[[:space:]]*(\#.*)?$'
>+
> for file in $FILES; do
>    if [ -f "$file" ]; then
>        if egrep -q '^[[:space:]]*ADDRESS[0-9]+=' $file ; then
>@@ -34,7 +36,7 @@
>        else
>            # older format
>            { cat "$file" ; echo ; } | while read line; do
>-               if [[ ! "$line" =~ '^[[:space:]]*(\#.*)?$' ]]; then
>+               if [[ ! "$line" =~ $MATCH ]]; then
>                    /sbin/ip route add $line
>                fi
>            done
>@@ -58,7 +60,7 @@
> for file in $FILES; do
>    if [ -f "$file" ]; then
>        { cat "$file" ; echo ; } | while read line; do
>-	   if [[ ! "$line" =~ '^[[:space:]]*(\#.*)?$' ]]; then
>+           if [[ ! "$line" =~ $MATCH ]]; then
> 	       /sbin/ip rule add $line
> 	   fi
>        done

Actions: View | Diff

Attachments on bug 220087: 205581