cleanup MTD option handling

[openwrt.git] / package / base-files / files / usr / share / udhcpc / default.script

diff --git a/package/base-files/files/usr/share/udhcpc/default.script b/package/base-files/files/usr/share/udhcpc/default.script
index 30e84e6..84c7297 100755 (executable)
--- a/package/base-files/files/usr/share/udhcpc/default.script
+++ b/package/base-files/files/usr/share/udhcpc/default.script
@@ -7,7 +7,6 @@ RESOLV_CONF="/tmp/resolv.conf.auto"
 
 hotplug_event() {
        scan_interfaces
 
 hotplug_event() {
        scan_interfaces

-       config_load /var/state/network

        for ifc in $interfaces; do
                config_get ifname $ifc ifname
                [ "$ifname" = "$interface" ] || continue
        for ifc in $interfaces; do
                config_get ifname $ifc ifname
                [ "$ifname" = "$interface" ] || continue


@@ -15,12 +14,21 @@ hotplug_event() {
                config_get proto $ifc proto
                [ "$proto" = "dhcp" ] || continue
                [ ifup = "$1" ] && {
                config_get proto $ifc proto
                [ "$proto" = "dhcp" ] || continue
                [ ifup = "$1" ] && {

-                       uci set "/var/state/network.$ifc.ipaddr=$ip"
-                       uci set "/var/state/network.$ifc.netmask=${subnet:-255.255.255.0}"
-                       uci set "/var/state/network.$ifc.dnsdomain=$domain"
-                       uci set "/var/state/network.$ifc.dns=$dns"
-                       uci set "/var/state/network.$ifc.gateway=$router"
+                       config_get userdns "$ifc" dns
+                       [ -n "$userdns" ] && {
+                               for i in $userdns; do
+                                       echo "custom dns $i"
+                                       echo "nameserver $i" >> "${RESOLV_CONF}.tmp"
+                               done
+                               dns="$userdns"
+                       }
+                       uci_set_state network "$ifc" ipaddr "$ip"
+                       uci_set_state network "$ifc" netmask "${subnet:-255.255.255.0}"
+                       uci_set_state network "$ifc" dnsdomain "$domain"
+                       uci_set_state network "$ifc" dns "$dns"
+                       uci_set_state network "$ifc" gateway "$router"

                }
                }

+               

                env -i ACTION="$1" INTERFACE="$ifc" DEVICE="$ifname" PROTO=dhcp /sbin/hotplug-call iface
        done
 }
                env -i ACTION="$1" INTERFACE="$ifc" DEVICE="$ifname" PROTO=dhcp /sbin/hotplug-call iface
        done
 }


@@ -46,19 +54,29 @@ case "$1" in
                        echo "deleting old routes"
                        $(route -n | awk '/^0.0.0.0\W{9}('$valid')\W/ {next} /^0.0.0.0/ {print "route del -net "$1" gw "$2";"}')
                }
                        echo "deleting old routes"
                        $(route -n | awk '/^0.0.0.0\W{9}('$valid')\W/ {next} /^0.0.0.0/ {print "route del -net "$1" gw "$2";"}')
                }

+
+               [ -n "$dns" ] && \
+                       echo -n > "${RESOLV_CONF}.tmp"

                
                [ -n "$dns" ] && {
                
                [ -n "$dns" ] && {

-                       echo -n > "${RESOLV_CONF}.tmp"
+                       [ -s "${RESOLV_CONF}.tmp" ] || {
+                               for i in $dns ; do
+                                       echo "adding dns $i"
+                                       echo "nameserver $i" >> "${RESOLV_CONF}.tmp"
+                               done
+                       }
+

                        ${domain:+echo search $domain} >> "${RESOLV_CONF}.tmp"
                        ${domain:+echo search $domain} >> "${RESOLV_CONF}.tmp"

-                       for i in $dns ; do
-                               echo "adding dns $i"
-                               echo "nameserver $i" >> "${RESOLV_CONF}.tmp"
-                       done
+

                        mv "${RESOLV_CONF}.tmp" "$RESOLV_CONF"
                }
                        mv "${RESOLV_CONF}.tmp" "$RESOLV_CONF"
                }

-               
-               hotplug_event ifup
-               
+
+               if [ "$1" = "renew" ]; then
+                       hotplug_event update
+               else
+                       hotplug_event ifup
+               fi
+

                # user rules
                [ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
        ;;
                # user rules
                [ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
        ;;