Speed up cleanup of staled zebra routes, thanks to Jan Oravec <jan.oravec at 6com dot sk> (#168247).

Package-Manager: portage-2.1.1-r2

3 files changed, 21 insertions, 23 deletions

diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index 94ae6e29e408..20b91ac17f06 100644
--- a/net-misc/quagga/ChangeLog
+++ b/net-misc/quagga/ChangeLog
@@ -2,7 +2,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Copyright 2003-2004 DataCore GmbH
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.47 2007/01/12 14:04:43 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.48 2007/02/25 09:57:17 mrness Exp $
+
+  25 Feb 2007; Alin Năstac <mrness@gentoo.org> files/zebra.init:
+  Speed up cleanup of staled zebra routes, thanks to Jan Oravec <jan.oravec at
+  6com dot sk> (#168247).
 
 *quagga-0.99.6 (12 Jan 2007)
 
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index 0da55f2a62e6..a4037cda0644 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -33,10 +33,10 @@ AUX zebra.conf 371 RMD160 618332506925b73df1fa66b80cc6aea3a6cdebb3 SHA1 a4c7a774
 MD5 c38e884372406e9e59616e436cd26388 files/zebra.conf 371
 RMD160 618332506925b73df1fa66b80cc6aea3a6cdebb3 files/zebra.conf 371
 SHA256 291bf052f3b1175c4c04c7ed7e3528acbd5143048da49b4fad3769ba2eedd26d files/zebra.conf 371
-AUX zebra.init 1168 RMD160 952e5be5268a8fe4e01141a92afc00ce735a440e SHA1 552339511bced7ad9be2f2ccb9a5987b81758089 SHA256 e7857a6db1775368a070011683216360c66877c0a4015dc5728b647e07448eb6
-MD5 2c1c5b782f96a74b48ccc496ad7a3865 files/zebra.init 1168
-RMD160 952e5be5268a8fe4e01141a92afc00ce735a440e files/zebra.init 1168
-SHA256 e7857a6db1775368a070011683216360c66877c0a4015dc5728b647e07448eb6 files/zebra.init 1168
+AUX zebra.init 1013 RMD160 1cb01c0b95fd8a49d442b2a0c1d900e1cee7d477 SHA1 462d7e255f01fb9615f99526976cef209ea332e7 SHA256 7eac27ca9661fb453a93b131bfbf69e409a06f65c2cedb83cdd55869d6871236
+MD5 6d51e9fca8d206a6d9d1d9fde793b48f files/zebra.init 1013
+RMD160 1cb01c0b95fd8a49d442b2a0c1d900e1cee7d477 files/zebra.init 1013
+SHA256 7eac27ca9661fb453a93b131bfbf69e409a06f65c2cedb83cdd55869d6871236 files/zebra.init 1013
 DIST quagga-0.98.6-patches-20060511.tar.gz 19251 RMD160 0c46dc9aac99a74871bf12523e4ed5de17baba01 SHA1 a44a3c7323102e483401db95723f529097256672 SHA256 bb94ec2897fac3c15454c6f25e6346be087db04ba4718cb629b7b41b63da1173
 DIST quagga-0.98.6.tar.gz 2019992 RMD160 e15cd93b5d321660d7e29fc27174352967342879 SHA1 2234d1235f504e9dc5865cc8d5fd4e250bf43ed5 SHA256 a84e1aac4e666929abd1942fa8958d9ef0d0bbf605f47d5c2a09f6be716987a1
 DIST quagga-0.99.5-patches-20061111.tar.gz 17786 RMD160 a301713e724bd0190302858f1209b4e32abb0e5b SHA1 fa2afcb1bb0ca2bded17eefb14a734b8f5ecc3d4 SHA256 0be922ffe1fbdf420500f8c93c8ac08bf37af77e91171d2f1a4fa2cad279272b
@@ -55,10 +55,10 @@ EBUILD quagga-0.99.6.ebuild 3943 RMD160 6734457d5ada5f3f1a923cd403952c92338f4ffe
 MD5 6a7ef034bd6a351f38d5f2c0ad797497 quagga-0.99.6.ebuild 3943
 RMD160 6734457d5ada5f3f1a923cd403952c92338f4ffe quagga-0.99.6.ebuild 3943
 SHA256 4e48c3b643d7fa1b929c3f5a3b5febd296325b4f13c53f7c629e918aa6fd0d38 quagga-0.99.6.ebuild 3943
-MISC ChangeLog 13326 RMD160 af4661f1482c894b52512fbc224ed28ebf7d2fae SHA1 17d79a2d81efb1b4a8438fa485182c42ddabd651 SHA256 2e424a7aa1e08b39971ad827e88d97a228cd7bfa95cc43ecbcf64fe38a922029
-MD5 ce8bd71a52e1979e4c7b85d4923a369a ChangeLog 13326
-RMD160 af4661f1482c894b52512fbc224ed28ebf7d2fae ChangeLog 13326
-SHA256 2e424a7aa1e08b39971ad827e88d97a228cd7bfa95cc43ecbcf64fe38a922029 ChangeLog 13326
+MISC ChangeLog 13498 RMD160 60931a8e9202dd56d98c477ed37c5e76f1b8d819 SHA1 663aefd7d09d970e391359286f40639ad8000469 SHA256 621f4a676d3f5ddec301c3830f2a955b78a641dcea38bb978fd8d8a6aae51cf3
+MD5 62c910b3a21fab4b452245b659f7c4ad ChangeLog 13498
+RMD160 60931a8e9202dd56d98c477ed37c5e76f1b8d819 ChangeLog 13498
+SHA256 621f4a676d3f5ddec301c3830f2a955b78a641dcea38bb978fd8d8a6aae51cf3 ChangeLog 13498
 MISC metadata.xml 1301 RMD160 2f07ee712c18a121b153385c20a69ceee57395aa SHA1 0d1a07e1b3821ec910b98531511f51f733915a8d SHA256 b6b92c898b68e0c1a270fbd47b91321e9a0db76068990fcbbd93ad83246b4cbb
 MD5 558920a085e2065a8aef6eca3e1896fb metadata.xml 1301
 RMD160 2f07ee712c18a121b153385c20a69ceee57395aa metadata.xml 1301
@@ -73,9 +73,9 @@ MD5 020249364f04aca6a99c4a884a11a344 files/digest-quagga-0.99.6 533
 RMD160 1f613d61d300c0a90644025df7e68b4845738c3e files/digest-quagga-0.99.6 533
 SHA256 9ff7f2ca0f6759755a3679f8fea920f3d205e3e7f28af0d53a54bd582333bd07 files/digest-quagga-0.99.6 533
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFp5WIJnxX6mF440QRAs3lAJ9KmZ0iKHCJ5SipeSpcbCx3mr4zrwCeKrj5
-ydNAMspm6Gd3mBv5r6ZwfSY=
-=9E14
+iD8DBQFF4V2JJnxX6mF440QRAig8AKChz3k/986YGKBIM9LgzVDwhLf1FACg0BzJ
+o25KxTyKWXSY/J1YBd6RW3k=
+=lxlY
 -----END PGP SIGNATURE-----
diff --git a/net-misc/quagga/files/zebra.init b/net-misc/quagga/files/zebra.init
index 45c90bf03736..5ca8ef58c0a8 100644
--- a/net-misc/quagga/files/zebra.init
+++ b/net-misc/quagga/files/zebra.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/zebra.init,v 1.1 2005/09/14 11:11:08 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/zebra.init,v 1.2 2007/02/25 09:57:18 mrness Exp $
 
 depend() {
 	need net
@@ -16,15 +16,9 @@ checkconfig() {
 }
 
 cleanup() {
-	stale=`ip route | grep 'proto zebra' | awk '{ print $1 }'`
-	if [ ! -z "$stale" ] ; then
-		einfo "Cleaning up stale zebra routes..."
-	fi
-	for r in $stale; do 
-		ebegin "Removing stale route to $r..."
-		ip route del $r; 
-		eend $?
-	done
+	ebegin "Cleaning up stale zebra routes..."
+	ip route flush proto zebra
+	eend $?
 }
 
 start() {