aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-02-05 07:57:07 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-02-05 07:57:07 +0000
commit520ea8e5f940cdaf9e612310578a7d184077b85c (patch)
tree4ca8f529130a9ddecf7333a780ef0b4fe4114315
parent988a987fea53f46a7febd57287a97da0c704eba9 (diff)
downloadupstream-520ea8e5f940cdaf9e612310578a7d184077b85c.tar.gz
upstream-520ea8e5f940cdaf9e612310578a7d184077b85c.tar.bz2
upstream-520ea8e5f940cdaf9e612310578a7d184077b85c.zip
base-files: fix udhcpc address acquisition on network restart (patch by Scott Dudley)
SVN-Revision: 19530
-rw-r--r--package/base-files/Makefile2
-rwxr-xr-xpackage/base-files/files/usr/share/udhcpc/default.script3
2 files changed, 3 insertions, 2 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index ae86a89183..fa0711fe2a 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:=37
+PKG_RELEASE:=38
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
diff --git a/package/base-files/files/usr/share/udhcpc/default.script b/package/base-files/files/usr/share/udhcpc/default.script
index b32b2c9f25..f704a7bf29 100755
--- a/package/base-files/files/usr/share/udhcpc/default.script
+++ b/package/base-files/files/usr/share/udhcpc/default.script
@@ -31,7 +31,8 @@ setup_interface () {
config_get old_subnet "$ifc" netmask
}
- [ "$ip" != "$old_ip" ] \
+ [ "$1" = "ifup" ] \
+ || [ "$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:-+}"