From db06bfe8064a33709ba4ddd63d441e3bb9d8e8e7 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Thu, 14 Dec 2006 10:18:58 +0000 Subject: [PATCH] refresh the alpha9 ifconfig patch Package-Manager: portage-2.1.2_rc3-r4 --- sys-apps/baselayout/Manifest | 8 ++--- .../baselayout-1.13.0_alpha9-ifconfig.patch | 30 +++++++++++++++++-- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 58d8d9f26541..6f23e34ccf60 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -98,10 +98,10 @@ AUX baselayout-1.13.0_alpha8-use.patch 685 RMD160 297e0d9529f83f2b7acd2d5e179262 MD5 8526913205a8290f5620ed14b12c54f1 files/baselayout-1.13.0_alpha8-use.patch 685 RMD160 297e0d9529f83f2b7acd2d5e17926242cda31e64 files/baselayout-1.13.0_alpha8-use.patch 685 SHA256 b785458e90cc9afa5bbe76aa9593e046fe3b6865024211afaa92a1f8e0b657c9 files/baselayout-1.13.0_alpha8-use.patch 685 -AUX baselayout-1.13.0_alpha9-ifconfig.patch 974 RMD160 69a693c32a41537306730e1f932601b3ebd429de SHA1 fe2841818810a967e79e22ad77e34605747ea74c SHA256 154726609dc7bacaf28501852512e4dd55dd197b3e8cbe56698f686f3b3c35b3 -MD5 1b46492844952ff685d9e961fd01ca02 files/baselayout-1.13.0_alpha9-ifconfig.patch 974 -RMD160 69a693c32a41537306730e1f932601b3ebd429de files/baselayout-1.13.0_alpha9-ifconfig.patch 974 -SHA256 154726609dc7bacaf28501852512e4dd55dd197b3e8cbe56698f686f3b3c35b3 files/baselayout-1.13.0_alpha9-ifconfig.patch 974 +AUX baselayout-1.13.0_alpha9-ifconfig.patch 1667 RMD160 769ed2c9b6887b6b40d50954f6ea780888d1611d SHA1 9641ddbe4134d6aa55afec05568c044c3615e173 SHA256 e5fb21b3bd6060d1e2a0abd6ffaa5dfd1b8556ed34dd07ea392782026db94147 +MD5 30f9873d785c75607841e582faedf677 files/baselayout-1.13.0_alpha9-ifconfig.patch 1667 +RMD160 769ed2c9b6887b6b40d50954f6ea780888d1611d files/baselayout-1.13.0_alpha9-ifconfig.patch 1667 +SHA256 e5fb21b3bd6060d1e2a0abd6ffaa5dfd1b8556ed34dd07ea392782026db94147 files/baselayout-1.13.0_alpha9-ifconfig.patch 1667 AUX copyright 2099 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 SHA1 3d5da783cc637392429ba2f63d321873fa1526ee SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 files/copyright 2099 diff --git a/sys-apps/baselayout/files/baselayout-1.13.0_alpha9-ifconfig.patch b/sys-apps/baselayout/files/baselayout-1.13.0_alpha9-ifconfig.patch index 4fbd667cb0ef..5cc3d5fbb192 100644 --- a/sys-apps/baselayout/files/baselayout-1.13.0_alpha9-ifconfig.patch +++ b/sys-apps/baselayout/files/baselayout-1.13.0_alpha9-ifconfig.patch @@ -1,8 +1,18 @@ Index: net.BSD/ifconfig.sh =================================================================== ---- net.BSD/ifconfig.sh (revision 2414) +--- net.BSD/ifconfig.sh (revision 2420) +++ net.BSD/ifconfig.sh (working copy) -@@ -319,7 +319,8 @@ +@@ -268,9 +268,6 @@ + config[0]="inet add ${config[0]}" + fi + +- # Ensure that the interface is up so we can add IPv6 addresses +- interface_up "${iface}" +- + # Finally add the address + ifconfig "${iface}" ${config[@]} + } +@@ -319,7 +316,8 @@ x="-net ${x}" elif [[ ${y} == *.*.*.*/32 ]] ; then x="-host ${x}" @@ -14,7 +24,7 @@ Index: net.BSD/ifconfig.sh # Given the lack of a netmask, we assume a host Index: net.Linux/ifconfig.sh =================================================================== ---- net.Linux/ifconfig.sh (revision 2414) +--- net.Linux/ifconfig.sh (revision 2420) +++ net.Linux/ifconfig.sh (working copy) @@ -370,7 +370,8 @@ x="-net ${x}" @@ -26,3 +36,17 @@ Index: net.Linux/ifconfig.sh x="-net ${x}" else # Given the lack of a netmask, we assume a host +@@ -437,11 +438,8 @@ + fi + + # Some kernels like to apply lo with an address when they are brought up +- if [[ ${config[@]} == "127.0.0.1 netmask 255.0.0.0 broadcast 127.255.255.255" ]]; then +- if is_loopback "${real_iface}" ; then +- ifconfig "${real_iface}" ${config[@]} +- return 0 +- fi ++ if [[ ${config[@]} == "127.0.0.1/8 brd 127.255.255.255" ]]; then ++ is_loopback "${real_iface}" && ifconfig "${real_iface}" 0.0.0.0 + fi + + ifconfig "${iface}" ${config[@]} -- 2.26.2