diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2006-10-15 13:46:53 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2006-10-15 13:46:53 +0000 |
| commit | 67c0965158b7806328d1289ac406ffe5479500ec (patch) | |
| tree | c522a691ab92c2ae804c7375bb3d6111545be1be /net-misc | |
| parent | Stable on ppc64; bug #151233 (diff) | |
| download | historical-67c0965158b7806328d1289ac406ffe5479500ec.tar.gz historical-67c0965158b7806328d1289ac406ffe5479500ec.tar.bz2 historical-67c0965158b7806328d1289ac406ffe5479500ec.zip | |
Respect PEER_ROUTERS set by the nogateway option in conf.d/net, #151240.
Thanks to John Koleszar.
Package-Manager: portage-2.1.2_pre2-r9
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/udhcp/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/udhcp/Manifest | 16 | ||||
| -rw-r--r-- | net-misc/udhcp/files/udhcpc.sh | 3 |
3 files changed, 16 insertions, 9 deletions
diff --git a/net-misc/udhcp/ChangeLog b/net-misc/udhcp/ChangeLog index 4bf69b7a641b..66e1bb5c4dc7 100644 --- a/net-misc/udhcp/ChangeLog +++ b/net-misc/udhcp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/udhcp # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/udhcp/ChangeLog,v 1.30 2006/10/01 21:01:42 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/udhcp/ChangeLog,v 1.31 2006/10/15 13:46:53 uberlord Exp $ + + 15 Oct 2006; Roy Marples <uberlord@gentoo.org> files/udhcpc.sh: + Respect PEER_ROUTERS set by the nogateway option in conf.d/net, #151240. + Thanks to John Koleszar. 01 Oct 2006; Tobias Scherbaum <dertobi123@gentoo.org> udhcp-0.9.9_pre20041216-r3.ebuild: diff --git a/net-misc/udhcp/Manifest b/net-misc/udhcp/Manifest index 5ad8776f5f34..52a84056c96a 100644 --- a/net-misc/udhcp/Manifest +++ b/net-misc/udhcp/Manifest @@ -10,10 +10,10 @@ AUX udhcp.rc 719 RMD160 15d474dd873685bf1c301e772548a27f6fc26d5e SHA1 0e30d4c841 MD5 f74f1f81c1fd4933d63b860dc070eec6 files/udhcp.rc 719 RMD160 15d474dd873685bf1c301e772548a27f6fc26d5e files/udhcp.rc 719 SHA256 ec031a7de6ed600d5172fc6e131dfd16160e471da9aac8558ad88f1b1c5bc6e1 files/udhcp.rc 719 -AUX udhcpc.sh 2363 RMD160 41e77f82461ff90fae8e7d4c24229b208230cffc SHA1 d8a0b7e804e6be32aa97fc586f5289b7cdebd8fd SHA256 32ad4650780134ccb07d6f022e952a8b0cc9f88ccbb78631b738d54b2894e93b -MD5 fc8a44ba5943f0bbf8e64ac000842533 files/udhcpc.sh 2363 -RMD160 41e77f82461ff90fae8e7d4c24229b208230cffc files/udhcpc.sh 2363 -SHA256 32ad4650780134ccb07d6f022e952a8b0cc9f88ccbb78631b738d54b2894e93b files/udhcpc.sh 2363 +AUX udhcpc.sh 2448 RMD160 da50cc701398ebc9324c885e0a161a58e51f798f SHA1 567b85273efc52146fe9b05f9ac9b648f9cf43c7 SHA256 db1e46cd54a19a3f18e9127422e6d292039f5b0e166b118f43dcad309107a43b +MD5 1c8b2d4d39c05153522738aca4dc26fb files/udhcpc.sh 2448 +RMD160 da50cc701398ebc9324c885e0a161a58e51f798f files/udhcpc.sh 2448 +SHA256 db1e46cd54a19a3f18e9127422e6d292039f5b0e166b118f43dcad309107a43b files/udhcpc.sh 2448 DIST udhcp-0.9.8.tar.gz 43889 DIST udhcp-0.9.9_pre20041216.tar.bz2 42353 RMD160 ed223b166f9ab9c0e0b210b690319e3ca8417af5 SHA1 f4555fe1c98305b23fdae4e520ec564703ab89a8 SHA256 e4bcf9490f5e5c14a97d6ca46f054225e15a765edf9cdb181888032a0082dad6 EBUILD udhcp-0.9.8-r3.ebuild 1166 RMD160 386711e40d25bfae45fd8500a34c167efa0c8495 SHA1 dd8a0dd922a862efb55c7088064caa0cc72b6b71 SHA256 86b8bdb9f65695e9cf3fcf850072df2fef5d9044158029b66f8f9de096a40378 @@ -28,10 +28,10 @@ EBUILD udhcp-0.9.9_pre20041216-r3.ebuild 1507 RMD160 0443283ed249a8c9c267ca2138d MD5 35759164e752ab709dc75a507962b8ea udhcp-0.9.9_pre20041216-r3.ebuild 1507 RMD160 0443283ed249a8c9c267ca2138d0a3f390f483a2 udhcp-0.9.9_pre20041216-r3.ebuild 1507 SHA256 e5103757a1643a0e4846ed4ac6b3ae49daa757841dd9da1fdc01eaa05eee1be4 udhcp-0.9.9_pre20041216-r3.ebuild 1507 -MISC ChangeLog 4199 RMD160 fd3b0e2ecebf623ef073e4f9bf03847c5a183928 SHA1 b086a75e852a2b2606152e28deb77e48d2d4986f SHA256 e11c7a936de8565f84776a143ad59005d61665e4dc352995886f8f7c482988c0 -MD5 22828ae4cbfad710bf01e673074a7bee ChangeLog 4199 -RMD160 fd3b0e2ecebf623ef073e4f9bf03847c5a183928 ChangeLog 4199 -SHA256 e11c7a936de8565f84776a143ad59005d61665e4dc352995886f8f7c482988c0 ChangeLog 4199 +MISC ChangeLog 4366 RMD160 fbb8f0246b48b586bd24a1c6e132f858ed06be09 SHA1 2a2c5ca3a2ec52b21d309c3422e3fe7c822820e7 SHA256 08ba55cc52dca1497e081f882e79bd40f924e2b7293ae083b5e908906d9da40e +MD5 fec0bbbcb5a925ca969d8141acc250b9 ChangeLog 4366 +RMD160 fbb8f0246b48b586bd24a1c6e132f858ed06be09 ChangeLog 4366 +SHA256 08ba55cc52dca1497e081f882e79bd40f924e2b7293ae083b5e908906d9da40e ChangeLog 4366 MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2873e32de89c0b0aeb26b5782f77cb00948e SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 metadata.xml 161 diff --git a/net-misc/udhcp/files/udhcpc.sh b/net-misc/udhcp/files/udhcpc.sh index 4f4a4702b2f4..83cb1d9d1470 100644 --- a/net-misc/udhcp/files/udhcpc.sh +++ b/net-misc/udhcp/files/udhcpc.sh @@ -62,6 +62,9 @@ update_routes() while route del default dev "${interface}" 2>/dev/null ; do : done + + [[ -n "${PEER_ROUTERS}" ]] && [[ "${PEER_ROUTERS}" != "yes" ]] && return + if [[ -n "${router}" ]] ; then metric= [[ -n "${IF_METRIC}" ]] && metric="metric ${IF_METRIC}" |