From ef34750d84e32dd7fea46134ce353e4a73993229 Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 12 Feb 2010 02:06:57 +0000
Subject: [package] base-files: revert dhcp state information on ifdown and
 restore pre-r19530 behaviour in udhcp default.script

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19597 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile                              | 2 +-
 package/base-files/files/lib/network/config.sh           | 5 +++++
 package/base-files/files/usr/share/udhcpc/default.script | 3 +--
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'package')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index fa0711fe2..5cd87a66f 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -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/
 
diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index 12b08a29f..b7d7b259a 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/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() {
 	local dev="$1"
 	local brdev
diff --git a/package/base-files/files/usr/share/udhcpc/default.script b/package/base-files/files/usr/share/udhcpc/default.script
index f704a7bf2..b32b2c9f2 100755
--- a/package/base-files/files/usr/share/udhcpc/default.script
+++ b/package/base-files/files/usr/share/udhcpc/default.script
@@ -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:-+}"
-- 
cgit v1.2.3