ppp: derive interface unit numbers from previous enumeration

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12417 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 10 insertions, 4 deletions

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 6b8ad9ca7..af01d446c 100644
--- 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"
 	}
 }