base-files: - restore device, ifname and aliases state in dhcp script - make sure...

SVN-Revision: 15753

diff --git a/package/base-files/files/usr/share/udhcpc/default.script b/package/base-files/files/usr/share/udhcpc/default.script
index 7dfb0f93e2a4911224630a69511c1b77859b2f80..b22cc8b04df9dfa59597be49f3d839e8420c5d66 100755 (executable)
--- a/package/base-files/files/usr/share/udhcpc/default.script
+++ b/package/base-files/files/usr/share/udhcpc/default.script
@@ -68,7 +68,7 @@ setup_interface () {
        user_dns=$(uci_get "network.$ifc.dns")
        [ -n "$user_dns" ] && dns="$user_dns"
 
-       [ -n "$dns" ] && [ "$dns" != "$old_dns" ] && {
+       [ -n "$dns" ] && [ ! -s "${RESOLV_CONF}.tmp" -o "$dns" != "$old_dns" ] && {
                echo "udhcpc: setting dns servers: $dns"
                echo -n > "${RESOLV_CONF}.tmp"
                for i in $dns ; do
@@ -110,7 +110,14 @@ for ifc in $interfaces; do
                deconfig)
                        ifconfig "$interface" 0.0.0.0
                        env -i ACTION="ifdown" INTERFACE="$ifc" DEVICE="$ifname" PROTO=dhcp /sbin/hotplug-call iface
+                       
+                       config_get device "$ifc" device
+                       config_get ifname "$ifc" ifname
+                       config_get aliases "$ifc" aliases
                        uci_revert_state network "$ifc"
+                       [ -n "$device" ] && uci_set_state network "$ifc" device "$device"
+                       [ -n "$ifname" ] && uci_set_state network "$ifc" ifname "$ifname"
+                       [ -n "$aliases" ] && uci_set_state network "$ifc" aliases "$aliases"
                ;;
                renew)
                        setup_interface update