diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-02-12 02:06:57 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-02-12 02:06:57 +0000 |
| commit | 8f103736e7503b503ea4d9324df328a2a5106ff0 (patch) | |
| tree | 195407ca522b7007196d2471090fed8068588b83 | |
| parent | 21a25fd0e3c8573a20664946e07d7a059483fff1 (diff) | |
| download | upstream-8f103736e7503b503ea4d9324df328a2a5106ff0.tar.gz upstream-8f103736e7503b503ea4d9324df328a2a5106ff0.tar.bz2 upstream-8f103736e7503b503ea4d9324df328a2a5106ff0.zip | |
[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
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rwxr-xr-x | package/base-files/files/lib/network/config.sh | 5 | ||||
| -rwxr-xr-x | package/base-files/files/usr/share/udhcpc/default.script | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index fa0711fe2a..5cd87a66f5 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 12b08a29ff..b7d7b259a9 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 f704a7bf29..b32b2c9f25 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:-+}" |