From 250b52f6737c253a2b6ff3dd5804afbe3d0cfce0 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 12 Feb 2010 02:06:57 +0000 Subject: base-files: revert dhcp state information on ifdown and restore pre-r19530 behaviour in udhcp default.script SVN-Revision: 19597 --- package/base-files/files/lib/network/config.sh | 5 +++++ package/base-files/files/usr/share/udhcpc/default.script | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'package/base-files/files') diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh index 12b08a2..b7d7b25 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 f704a7b..b32b2c9 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.1