aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-04-03 01:23:45 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-04-03 01:23:45 +0000
commite4e63b9c1b93252bb853720bf7b8882923d1aa07 (patch)
tree1906c027a3ee652a97f34f42a66f0cfc7790a824 /package/base-files
parentd34eae3378dc75d1da9513474836b9d2ca01ae5f (diff)
downloadupstream-e4e63b9c1b93252bb853720bf7b8882923d1aa07.tar.gz
upstream-e4e63b9c1b93252bb853720bf7b8882923d1aa07.tar.bz2
upstream-e4e63b9c1b93252bb853720bf7b8882923d1aa07.zip
base-files: bridge config, avoid having a random ipv6 ll address
So far, we are setting the bridge interface up before having added any bridge interface ports. This results in the bridge assigning a random mac address to its bridge interface and therefore IPv6 assigning a matching link local address to the bridge interface as soon as the bridge interface is up. After adding the first bridge port interface, the bridge's mac address is reset correctly, however the IPv6 link local address stays the same. This commit ensures that we are at least having the IPv6 link local address of the first interface added to the bridge instead of a random one. Signed-off-by: Linus Lüssing <linus.luessing@web.de> SVN-Revision: 26426
Diffstat (limited to 'package/base-files')
-rwxr-xr-xpackage/base-files/files/lib/network/config.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index def1562901..9489ccf95e 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -186,11 +186,11 @@ prepare_interface() {
config_get_bool stp "$config" stp 0
$DEBUG brctl addbr "br-$config"
$DEBUG brctl setfd "br-$config" 0
- $DEBUG ifconfig "br-$config" up
$DEBUG ifconfig "$iface" 0.0.0.0
$DEBUG do_sysctl "net.ipv6.conf.$iface.disable_ipv6" 1
$DEBUG brctl addif "br-$config" "$iface"
$DEBUG brctl stp "br-$config" $stp
+ $DEBUG ifconfig "br-$config" up
# Creating the bridge here will have triggered a hotplug event, which will
# result in another setup_interface() call, so we simply stop processing
# the current event at this point.