KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
SVN-Revision: 17596
This commit is contained in:
Jo-Philipp Wich 2009-09-16 14:21:19 +00:00
parent dd88fdee33
commit 2f921cb48d
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/base-files/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=base-files PKG_NAME:=base-files
PKG_RELEASE:=30 PKG_RELEASE:=31
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/

2
package/base-files/files/lib/network/config.sh
View file

@ -123,6 +123,7 @@ prepare_interface() {
append newdevs "$dev" append newdevs "$dev"
done done
uci_set_state network "$config" device "$newdevs" uci_set_state network "$config" device "$newdevs"
$DEBUG ifconfig "$iface" 0.0.0.0
$DEBUG brctl addif "br-$config" "$iface" $DEBUG brctl addif "br-$config" "$iface"
# Bridge existed already. No further processing necesary # Bridge existed already. No further processing necesary
} || { } || {
@ -131,6 +132,7 @@ prepare_interface() {
$DEBUG brctl addbr "br-$config" $DEBUG brctl addbr "br-$config"
$DEBUG brctl setfd "br-$config" 0 $DEBUG brctl setfd "br-$config" 0
$DEBUG ifconfig "br-$config" up $DEBUG ifconfig "br-$config" up
$DEBUG ifconfig "$iface" 0.0.0.0
$DEBUG brctl addif "br-$config" "$iface" $DEBUG brctl addif "br-$config" "$iface"
$DEBUG brctl stp "br-$config" $stp $DEBUG brctl stp "br-$config" $stp
# Creating the bridge here will have triggered a hotplug event, which will # Creating the bridge here will have triggered a hotplug event, which will