speed up startup in special cases (bug #36195)

5 files changed, 13 insertions, 9 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 2b9733aa9ba7..1945638a0569 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/ppp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.36 2003/12/22 15:16:18 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.37 2003/12/22 15:20:43 lanius Exp $
+
+  22 Dec 2003; Heinrich Wendel <lanius@gentoo.org> files/2.4.2b3/ip-down,
+  files/2.4.2b3/ip-up, files/2.4.2b3/net.ppp0:
+  speed up startup in special cases (bug #36195)
 
 *ppp-2.4.2_beta3-r1 (22 Dec 2003)
 
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index fb53c2b47b79..69ec0325b8ac 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -2,7 +2,7 @@ MD5 648b6db3701175b44066900c0b4a64eb ppp-2.4.2_beta3-r1.ebuild 3415
 MD5 82e881305bcfc09888896071fb0219fa ppp-2.4.1-r14.ebuild 4613
 MD5 8c76dfcef79983fe7b2b7063f4750c97 ppp-2.4.1-r11.ebuild 3078
 MD5 f40c064374bb77f9069e73b9932bcd1b ppp-2.4.1-r13.ebuild 4563
-MD5 7912745283d4f6cad60f50805f7093c3 ChangeLog 6859
+MD5 4b523f27a5550db6f0f99c8f989f8e40 ChangeLog 7030
 MD5 158a1bb8f34a4d2b1ed62513de95e47d ppp-2.4.2_beta3.ebuild 4342
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 9e3a4dcb54e60375e054b4154d94e0f9 ppp-2.4.1-r12.ebuild 3816
@@ -31,14 +31,14 @@ MD5 0713ffc9ae6e3ee4ef0f5c3cb752b3ea files/ip-down 285
 MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605
 MD5 2890b47660f967a07ac5b211850e46c5 files/2.4.2b3/options-pptp 238
 MD5 7004513b8b14aad3e2f598535e672af4 files/2.4.2b3/chat-default 351
-MD5 3b530cf8c43cf1e13648b28848ae752f files/2.4.2b3/ip-up 686
+MD5 649035cc45cf067d76e0faabfc87c825 files/2.4.2b3/ip-up 704
 MD5 1c6a75aa9390438f483e2885ea40ca72 files/2.4.2b3/killaddr-smarter.patch 6225
 MD5 12500a756925e9d8f4b2b655e95a2541 files/2.4.2b3/confd.ppp0 2784
 MD5 fa2a5b8df496922fa2fb592115953b6b files/2.4.2b3/options-pppoe 53
 MD5 bf0ee7e6765e3b18dbe3964be6cd4500 files/2.4.2b3/mpls.patch 10506
-MD5 346b3167786218efdc517e11c33760fc files/2.4.2b3/net.ppp0 4344
+MD5 639e33b901bd31c59ef1b3e0b40f2b08 files/2.4.2b3/net.ppp0 4347
 MD5 1fd88dda7f4996799c69a9501d42cc23 files/2.4.2b3/README.mpls 530
 MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/2.4.2b3/modules.ppp 268
-MD5 911e8bfe62182274d6b2fbf49aae0d87 files/2.4.2b3/ip-down 624
+MD5 c4e991f87477e4fe5a402ef3f8dc9a08 files/2.4.2b3/ip-down 642
 MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/2.4.2b3/pppoe.html 7605
 MD5 0e16e7bb8ae71505e719fe5471bd2097 files/2.4.2b3/cflags.patch 3403
diff --git a/net-dialup/ppp/files/2.4.2b3/ip-down b/net-dialup/ppp/files/2.4.2b3/ip-down
index 62a5426a8593..767aafbea610 100644
--- a/net-dialup/ppp/files/2.4.2b3/ip-down
+++ b/net-dialup/ppp/files/2.4.2b3/ip-down
@@ -24,4 +24,4 @@ fi
 
 [ -f /etc/init.d/firewall ] && /etc/init.d/firewall stop
 
-[ -f /etc/ppp/ip-down.local ] && . /etc/ppp/ip-down.local
+[ -f /etc/ppp/ip-down.local ] && . /etc/ppp/ip-down.local $1 $2 $3 $4 $5 $6
diff --git a/net-dialup/ppp/files/2.4.2b3/ip-up b/net-dialup/ppp/files/2.4.2b3/ip-up
index afca5d614f0a..e7ce165494d1 100644
--- a/net-dialup/ppp/files/2.4.2b3/ip-up
+++ b/net-dialup/ppp/files/2.4.2b3/ip-up
@@ -25,4 +25,4 @@ fi
 
 [ -f /etc/init.d/firewall ] && /etc/init.d/firewall start
 
-[ -f /etc/ppp/ip-up.local ] && . /etc/ppp/ip-up.local
+[ -f /etc/ppp/ip-up.local ] && . /etc/ppp/ip-up.local $1 $2 $3 $4 $5 $6
diff --git a/net-dialup/ppp/files/2.4.2b3/net.ppp0 b/net-dialup/ppp/files/2.4.2b3/net.ppp0
index 5c1f89422ac3..ab39cc0a4696 100644
--- a/net-dialup/ppp/files/2.4.2b3/net.ppp0
+++ b/net-dialup/ppp/files/2.4.2b3/net.ppp0
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/files/2.4.2b3/net.ppp0,v 1.2 2003/12/22 15:16:18 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/files/2.4.2b3/net.ppp0,v 1.3 2003/12/22 15:20:43 lanius Exp $
 
 # Misc internal variables
 CMD_LINE=""
@@ -31,7 +31,7 @@ start() {
 
 		if [ "${DEFROUTE}" = "yes" ]
 		then
-			[ -n "$(/sbin/route | egrep 'default')" ] && route del default
+			[ -n "$(/sbin/route -n | egrep '0.0.0.0')" ] && route del default
 		fi
 		# Added hide-password here, can't be too sure...
 		/usr/sbin/pppd ${CMD_LINE} ${MODEMPORT} ${LINESPEED} \