From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 28 Aug 2008 00:15:10 +0000 (+0000)
Subject: ppp: derive interface unit numbers from previous enumeration
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6488abc11c01177233e631118dbfa67d71d435f6;p=openwrt%2Fstaging%2Fthess.git

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 6b8ad9ca70..af01d446ce 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"
 	}
 }