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 | 250b52f6737c253a2b6ff3dd5804afbe3d0cfce0 (patch) | |
| tree | 45c22c4e7e6114a1501744ca093b904731412914 /package/base-files | |
| parent | cb9c37af385c64ee07c14f6b4e634d2d4cc4ad5c (diff) | |
| download | upstream-250b52f6737c253a2b6ff3dd5804afbe3d0cfce0.tar.gz upstream-250b52f6737c253a2b6ff3dd5804afbe3d0cfce0.tar.bz2 upstream-250b52f6737c253a2b6ff3dd5804afbe3d0cfce0.zip | |
base-files: revert dhcp state information on ifdown and restore pre-r19530 behaviour in udhcp default.script
SVN-Revision: 19597
Diffstat (limited to 'package/base-files')
| -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:-+}" |