Bladeren bron

base-files: clear ip addresses on interfaces that are about to be added to a bridge

SVN-Revision: 17596
Jo-Philipp Wich 16 jaren geleden
bovenliggende
commit
2f921cb48d
2 gewijzigde bestanden met toevoegingen van 3 en 1 verwijderingen
  1. 1 1
      package/base-files/Makefile
  2. 2 0
      package/base-files/files/lib/network/config.sh

+ 1 - 1
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/
 

+ 2 - 0
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