rpms/rp-pppoe/devel pppoe-connect, 1.2, 1.3 pppoe-start, 1.2, 1.3 pppoe-stop, 1.1, 1.2 rp-pppoe.spec, 1.46, 1.47

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/rp-pppoe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22540

Modified Files:
	pppoe-connect pppoe-start pppoe-stop rp-pppoe.spec 
Log Message:
add feature, save and restore all information about default routes bz#191242



Index: pppoe-connect
===================================================================
RCS file: /cvs/extras/rpms/rp-pppoe/devel/pppoe-connect,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pppoe-connect	11 Nov 2008 15:10:31 -0000	1.2
+++ pppoe-connect	7 Sep 2009 14:49:54 -0000	1.3
@@ -279,9 +279,11 @@ if test "$DEFROUTE" != "no" ; then
     DEFAULTROUTE="defaultroute"
     # pppd will no longer delete an existing default route
     # so we have to help it out a little here.
-    DEFRT=`ip route list | awk '/^default / { print $3 }'`
-    [ -n "${DEFRT}" ] && echo $DEFRT > /etc/default-route
-    route del default >/dev/null 2>&1
+    DEFRT=$(ip route list match 0/0)
+    [ -n "${DEFRT}" ] && echo "$DEFRT" > /etc/default-routes
+    echo "$DEFRT" | while read spec; do
+        ip route del $spec;
+    done
 else
     DEFAULTROUTE=""
 fi
@@ -351,9 +353,11 @@ echo $$ > $PIDFILE
 
 while [ true ] ; do
     if [ "${DEFROUTE}" != "no" ] ; then
-        DEFRT=`ip route list | awk '/^default / { print $3 }'`
-        [ -n "${DEFRT}" ] && echo $DEFRT > /etc/default-route
-        route del default >/dev/null 2>&1
+        DEFRT=$(ip route list match 0/0)
+        [ -n "${DEFRT}" ] && echo "$DEFRT" > /etc/default-routes
+        echo "$DEFRT" | while read spec; do
+            ip route del $spec;
+        done
     fi
 
     if test "$BR2684DEV" != ""; then


Index: pppoe-start
===================================================================
RCS file: /cvs/extras/rpms/rp-pppoe/devel/pppoe-start,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pppoe-start	20 Mar 2007 19:00:47 -0000	1.2
+++ pppoe-start	7 Sep 2009 14:49:54 -0000	1.3
@@ -217,9 +217,11 @@ kill $CONNECT_PID > /dev/null 2>&1
 rm -f "$PIDFILE" "$PIDFILE.pppd" "$PIDFILE.pppoe" "$PIDFILE.start"
 
 # add old default gw back
-if [ -s /etc/default-route ] ; then
-    route add default gw `cat /etc/default-route`
-    rm -f /etc/default-route
+if [ -s /etc/default-routes ] ; then
+    while read spec; do
+        /sbin/ip route add $spec
+    done < /etc/default-routes
+    rm -f /etc/default-routes
 fi
 
 exit 1


Index: pppoe-stop
===================================================================
RCS file: /cvs/extras/rpms/rp-pppoe/devel/pppoe-stop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pppoe-stop	20 Mar 2007 18:29:36 -0000	1.1
+++ pppoe-stop	7 Sep 2009 14:49:54 -0000	1.2
@@ -132,9 +132,11 @@ else
 fi
 
 # add old default gw back
-if [ -s /etc/default-route ] ; then
-    route add default gw `cat /etc/default-route`
-    rm -f /etc/default-route
+if [ -s /etc/default-routes ] ; then
+    while read spec; do
+        /sbin/ip route add $spec
+    done < /etc/default-routes
+    rm -f /etc/default-routes
 fi
 
 exit 0


Index: rp-pppoe.spec
===================================================================
RCS file: /cvs/extras/rpms/rp-pppoe/devel/rp-pppoe.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- rp-pppoe.spec	27 Jul 2009 03:09:49 -0000	1.46
+++ rp-pppoe.spec	7 Sep 2009 14:49:54 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: A PPP over Ethernet client (for xDSL support).
 Name: rp-pppoe
 Version: 3.10
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Url: http://www.roaringpenguin.com/pppoe/
@@ -145,6 +145,9 @@ exit 0
 %{_mandir}/man?/*
 
 %changelog
+* Mon Sep 07 2009 Than Ngo <than at redhat.com> - 3.10-4
+- add feature, save and restore all information about default routes bz#191242
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild