浏览代码

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

SVN-Revision: 19597
Jo-Philipp Wich 15 年之前
父节点
当前提交
250b52f673

+ 1 - 1
package/base-files/Makefile

@@ -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 - 0
package/base-files/files/lib/network/config.sh

@@ -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

+ 1 - 2
package/base-files/files/usr/share/udhcpc/default.script

@@ -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:-+}"