kernel: change debounce logic in the gpio-buttons driver

[openwrt.git] / package / ppp / files / ppp.sh

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 87872e0..23fcb89 100644 (file)
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -3,14 +3,26 @@ scan_ppp() {
        pppdev="${pppdev:-0}"
        config_get unit "$1" unit
        [ -z "$unit" ] && {
        pppdev="${pppdev:-0}"
        config_get unit "$1" unit
        [ -z "$unit" ] && {

-               config_set "$1" ifname "ppp$pppdev"
-               config_set "$1" unit "$pppdev"
-               pppdev="$(($pppdev + 1))"
+               unit="$pppdev"
+               if [ "${ifname%%[0-9]*}" = ppp ]; then
+                       unit="${ifname##ppp}"
+                       [ "$pppdev" -le "$unit" ] && pppdev="$(($unit + 1))"
+               else
+                       pppdev="$(($pppdev + 1))"
+               fi
+               config_set "$1" ifname "ppp$unit"
+               config_set "$1" unit "$unit"

        }
 }
 
 start_pppd() {
        local cfg="$1"; shift
        }
 }
 
 start_pppd() {
        local cfg="$1"; shift

+       local ifname
+
+       # make sure the network state references the correct ifname
+       scan_ppp "$cfg"
+       config_get ifname "$cfg" ifname
+       set_interface_ifname "$cfg" "$ifname"

 
        # make sure only one pppd process is started
        lock "/var/lock/ppp-${cfg}"
 
        # make sure only one pppd process is started
        lock "/var/lock/ppp-${cfg}"


@@ -39,9 +51,16 @@ start_pppd() {
        interval="${keepalive##*[, ]}"
        [ "$interval" != "$keepalive" ] || interval=5
 
        interval="${keepalive##*[, ]}"
        [ "$interval" != "$keepalive" ] || interval=5
 

-       config_get_bool peerdns "$cfg" peerdns 1 
-       [ "$peerdns" -eq 1 ] && peerdns="usepeerdns" || peerdns="" 
-       
+       config_get_bool peerdns "$cfg" peerdns 1
+       [ "$peerdns" -eq 1 ] && peerdns="usepeerdns" || {
+               peerdns=""
+               config_get dns "$config" dns
+               for dns in $dns; do
+                       grep -q "$dns" /tmp/resolv.conf.auto 2>/dev/null || \
+                               echo "nameserver $dns" >> /tmp/resolv.conf.auto
+               done
+       }
+

        config_get demand "$cfg" demand
        [ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf.auto
 
        config_get demand "$cfg" demand
        [ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf.auto
 


@@ -71,7 +90,7 @@ setup_interface_ppp() {
 
        config_get device "$config" device
 
 
        config_get device "$config" device
 

-       config_get mtu "$cfg" mtu
+       config_get mtu "$config" mtu

        mtu=${mtu:-1492}
        start_pppd "$config" \
                mtu $mtu mru $mtu \
        mtu=${mtu:-1492}
        start_pppd "$config" \
                mtu $mtu mru $mtu \