qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 23:29:22 +02:00
Code

network: do not unnecessarily touch interfaces configured as proto=none; bring down old aliases before setting up new ones

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16266 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2009-06-01 18:07:44 +00:00
parent 0df779132b
commit ce35aafec5
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
package/base-files/files/lib/network/config.sh
View File

@ -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"