[package] prevent kmod-switch from accessing nvram on brcm63xx (#5035)

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

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 87872e0..bfa708d 100644 (file)
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -3,9 +3,15 @@ scan_ppp() {
        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"
        }
 }
 
@@ -71,7 +77,7 @@ setup_interface_ppp() {
 
        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 \