From 2f921cb48d47a3aeb7e33773b6b0de0a71b36947 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 16 Sep 2009 14:21:19 +0000
Subject: [PATCH] base-files: clear ip addresses on interfaces that are about
to be added to a bridge
SVN-Revision: 17596
---
package/base-files/Makefile | 2 +-
package/base-files/files/lib/network/config.sh | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index d87253b4dd..6995601a28 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=base-files
-PKG_RELEASE:=30
+PKG_RELEASE:=31
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index bfadf40c89..fbbf0e119b 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -123,6 +123,7 @@ prepare_interface() {
append newdevs "$dev"
done
uci_set_state network "$config" device "$newdevs"
+ $DEBUG ifconfig "$iface" 0.0.0.0
$DEBUG brctl addif "br-$config" "$iface"
# Bridge existed already. No further processing necesary
} || {
@@ -131,6 +132,7 @@ prepare_interface() {
$DEBUG brctl addbr "br-$config"
$DEBUG brctl setfd "br-$config" 0
$DEBUG ifconfig "br-$config" up
+ $DEBUG ifconfig "$iface" 0.0.0.0
$DEBUG brctl addif "br-$config" "$iface"
$DEBUG brctl stp "br-$config" $stp
# Creating the bridge here will have triggered a hotplug event, which will
--
GitLab