aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-08-28 00:15:10 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-08-28 00:15:10 +0000
commit6488abc11c01177233e631118dbfa67d71d435f6 (patch)
tree75c964baf0f00b2bb44aa0980e2a5a8ffb95c608
parent1c3b76013a2c7bb94f8045cd0ec56b1ff4db95d2 (diff)
downloadupstream-6488abc11c01177233e631118dbfa67d71d435f6.tar.gz
upstream-6488abc11c01177233e631118dbfa67d71d435f6.tar.bz2
upstream-6488abc11c01177233e631118dbfa67d71d435f6.zip
ppp: derive interface unit numbers from previous enumeration
SVN-Revision: 12417
-rw-r--r--package/ppp/files/ppp.sh14
1 files changed, 10 insertions, 4 deletions
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"
}
}