SOURCES: rc-scripts-ppp-fixes.patch - better ip-{up, down} fix, wit...

[qboosh]

Author: qboosh                       Date: Sat Apr 28 12:12:04 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- better ip-{up,down} fix, without breaking ifup-aliases

---- Files affected:
SOURCES:
   rc-scripts-ppp-fixes.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/rc-scripts-ppp-fixes.patch
diff -u SOURCES/rc-scripts-ppp-fixes.patch:1.1 SOURCES/rc-scripts-ppp-fixes.patch:1.2
--- SOURCES/rc-scripts-ppp-fixes.patch:1.1	Sat Apr 28 01:33:11 2007
+++ SOURCES/rc-scripts-ppp-fixes.patch	Sat Apr 28 14:11:58 2007
@@ -1,27 +1,3 @@
---- sysconfig/network-scripts/ifup-aliases.orig	2007-04-02 17:51:37.000000000 +0200
-+++ sysconfig/network-scripts/ifup-aliases	2007-04-28 00:02:47.497639386 +0200
-@@ -5,6 +5,12 @@
- # Adds all addresses of device.
- # Called from ifup-post.
- 
-+if [ -f "/etc/sysconfig/interfaces/ifcfg-$CONFIG" ] ; then
-+	CONFFILE="/etc/sysconfig/interfaces/ifcfg-$CONFIG"
-+else
-+	CONFFILE="$CONFIG"
-+fi
-+
- # Add all addresses
- for IP_ADDR in $IPADDR_ALIASES; do
- 	IP_ADDR_OPT=""
-@@ -51,7 +57,7 @@ for IP_ADDR in $IPV6_ADDR; do
- 	fi
- done
- 
--for nr in $(awk 'BEGIN { max=0; }; /^IPADDR[0-9]+=/ { s = $0; gsub(/^IPADDR/, "", s); gsub(/=.*/, "", s); if (int(s) > int(max)) { max=s; }; };  END { for(j=1; j<=int(max); j++) print j } ' $CONFIG); do
-+for nr in $(awk 'BEGIN { max=0; }; /^IPADDR[0-9]+=/ { s = $0; gsub(/^IPADDR/, "", s); gsub(/=.*/, "", s); if (int(s) > int(max)) { max=s; }; };  END { for(j=1; j<=int(max); j++) print j } ' $CONFFILE); do
- 	eval IP_ADDR="\$IPADDR${nr}"
- 	[ -z "$IP_ADDR" ] && continue
- 
 --- sysconfig/network-scripts/ifdown-ppp.orig	2007-04-02 17:51:37.000000000 +0200
 +++ sysconfig/network-scripts/ifdown-ppp	2007-04-28 01:26:43.416620054 +0200
 @@ -33,8 +33,10 @@ kill -TERM ${PID} > /dev/null 2>&1
@@ -44,7 +20,7 @@
  . /etc/rc.d/init.d/functions
  . /etc/sysconfig/network-scripts/functions.network
 -CONFIG="$PPP_IPPARAM"
-+CONFIG="ifcfg-$PPP_IPPARAM"
++CONFIG="/etc/sysconfig/interfaces/ifcfg-$PPP_IPPARAM"
  source_config
  
  # as an additional convenience, $PPP_TTYNAME is set to the tty name,
@@ -55,7 +31,7 @@
  . /etc/rc.d/init.d/functions
  . /etc/sysconfig/network-scripts/functions.network
 -CONFIG="$PPP_IPPARAM"
-+CONFIG="ifcfg-$PPP_IPPARAM"
++CONFIG="/etc/sysconfig/interfaces/ifcfg-$PPP_IPPARAM"
  source_config
  
  # as an additional convienince, $PPP_TTYNAME is set to the tty name,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rc-scripts-ppp-fixes.patch?r1=1.1&r2=1.2&f=u