ppp: derive interface unit numbers from previous enumeration

SVN-Revision: 12417

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 6b8ad9ca7029284a6225d3836dbc700f98dc9225..af01d446ce7f2e1f89710af0becdba9f37f9155e 100644 (file)
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -2,10 +2,16 @@ scan_ppp() {
        config_get ifname "$1" ifname
        pppdev="${pppdev:-0}"
        config_get unit "$1" unit
-       [ -z "$unit" -a "${ifname%%[0-9]*}" != ppp ] && {
-               config_set "$1" ifname "ppp$pppdev"
-               config_set "$1" unit "$pppdev"
-               pppdev="$(($pppdev + 1))"
+       [ -z "$unit" ] && {
+               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"
        }
 }