summaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-06-01 18:07:44 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-06-01 18:07:44 +0000
commitce35aafec59e30e03f816183c14ab2b7894f072c (patch)
tree12741e45ccede407b21ff8ebd4fcea6bba92db93 /package/base-files
parent0df779132b2ed011fd155875e8eeac41ae6face0 (diff)
network: do not unnecessarily touch interfaces configured as proto=none; bring down old aliases before setting up new ones
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16266 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files')
-rwxr-xr-xpackage/base-files/files/lib/network/config.sh13
1 files changed, 11 insertions, 2 deletions
diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index d0aa33d1a..808463df5 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -84,6 +84,7 @@ prepare_interface() {
local iface="$1"
local config="$2"
local vifmac="$3"
+ local proto
# if we're called for the bridge interface itself, don't bother trying
# to create any interfaces here. The scripts have already done that, otherwise
@@ -91,9 +92,12 @@ prepare_interface() {
[ "br-$config" = "$iface" -o -e "$iface" ] && return 0;
ifconfig "$iface" 2>/dev/null >/dev/null && {
- # make sure the interface is removed from any existing bridge and deconfigured
- ifconfig "$iface" 0.0.0.0
+ config_get proto "$config" proto
+
+ # make sure the interface is removed from any existing bridge and deconfigured,
+ # (deconfigured only if the interface is not set to proto=none)
unbridge "$iface"
+ [ "$proto" = none ] || ifconfig "$iface" 0.0.0.0
# Change interface MAC address if requested
[ -n "$vifmac" ] && {
@@ -287,6 +291,11 @@ setup_interface() {
fi
;;
esac
+ [ "$proto" = none ] || {
+ for ifn in `ifconfig | grep "^$iface:" | awk '{print $1}'`; do
+ ifconfig "$ifn" down
+ done
+ }
config_set "$config" aliases ""
config_set "$config" alias_count 0
config_foreach setup_interface_alias alias "$config" "$iface"