mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-11-04 06:54:27 -05:00 
			
		
		
		
	base-files: revert dhcp state information on ifdown and restore pre-r19530 behaviour in udhcp default.script
SVN-Revision: 19597
This commit is contained in:
		
							parent
							
								
									cb9c37af38
								
							
						
					
					
						commit
						250b52f673
					
				@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 | 
			
		||||
include $(INCLUDE_DIR)/kernel.mk
 | 
			
		||||
 | 
			
		||||
PKG_NAME:=base-files
 | 
			
		||||
PKG_RELEASE:=38
 | 
			
		||||
PKG_RELEASE:=39
 | 
			
		||||
 | 
			
		||||
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -327,6 +327,11 @@ setup_interface() {
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
stop_interface_dhcp() {
 | 
			
		||||
	local config="$1"
 | 
			
		||||
	uci -P /var/state revert "network.$config"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
unbridge() {
 | 
			
		||||
	local dev="$1"
 | 
			
		||||
	local brdev
 | 
			
		||||
 | 
			
		||||
@ -31,8 +31,7 @@ setup_interface () {
 | 
			
		||||
		config_get old_subnet    "$ifc" netmask
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	[ "$1" = "ifup" ] \
 | 
			
		||||
	|| [ "$ip" != "$old_ip" ] \
 | 
			
		||||
	[ "$ip" != "$old_ip" ] \
 | 
			
		||||
	|| [ "${broadcast:-+}" != "$old_broadcast" ] \
 | 
			
		||||
	|| [ "${subnet:-255.255.255.0}" != "$old_subnet" ] && {
 | 
			
		||||
		echo "udhcpc: ifconfig $interface $ip netmask ${subnet:-255.255.255.0} broadcast ${broadcast:-+}"
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user