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

base-files: revert dhcp state information on ifdown and restore pre-r19530 behaviour in udhcp default.script

Browse source 
SVN-Revision: 19597
This commit is contained in:
Jo-Philipp Wich 2010-02-12 02:06:57 +00:00
parent cb9c37af38
commit 250b52f673
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/base-files/Makefile
View file

@ -10,7 +10,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:=38 PKG_RELEASE:=39
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/

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

@ -327,6 +327,11 @@ setup_interface() {
} }
} }
stop_interface_dhcp() {
local config="$1"
uci -P /var/state revert "network.$config"
}
unbridge() { unbridge() {
local dev="$1" local dev="$1"
local brdev local brdev

3
package/base-files/files/usr/share/udhcpc/default.script
View file

@ -31,8 +31,7 @@ setup_interface () {
config_get old_subnet "$ifc" netmask config_get old_subnet "$ifc" netmask
} }
[ "$1" = "ifup" ] \ [ "$ip" != "$old_ip" ] \
|| [ "$ip" != "$old_ip" ] \
|| [ "${broadcast:-+}" != "$old_broadcast" ] \ || [ "${broadcast:-+}" != "$old_broadcast" ] \
|| [ "${subnet:-255.255.255.0}" != "$old_subnet" ] && { || [ "${subnet:-255.255.255.0}" != "$old_subnet" ] && {
echo "udhcpc: ifconfig $interface $ip netmask ${subnet:-255.255.255.0} broadcast ${broadcast:-+}" echo "udhcpc: ifconfig $interface $ip netmask ${subnet:-255.255.255.0} broadcast ${broadcast:-+}"