fix ppp unit number issues (#2178)

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

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 0d0941f..5ca1cf9 100644 (file)
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -1,8 +1,12 @@
 scan_ppp() {
        config_get ifname "$1" ifname
        pppdev="${pppdev:-0}"
 scan_ppp() {
        config_get ifname "$1" ifname
        pppdev="${pppdev:-0}"

-       config_set "$1" ifname "ppp$pppdev"
-       config_set "$1" unit "$pppdev"
+       config_get unit "$1" unit
+       [ -z "$unit" ] && {
+               config_set "$1" ifname "ppp$pppdev"
+               config_set "$1" unit "$pppdev"
+               pppdev="$(($pppdev + 1))"
+       }

 }
 
 start_pppd() {
 }
 
 start_pppd() {


@@ -24,6 +28,9 @@ start_pppd() {
 
        config_get connect "$cfg" connect
        config_get disconnect "$cfg" disconnect
 
        config_get connect "$cfg" connect
        config_get disconnect "$cfg" disconnect

+       config_get pppd_options "$cfg" pppd_options
+       config_get_bool defaultroute "$cfg" defaultroute 1
+       [ "$defaultroute" -eq 1 ] && defaultroute="defaultroute replacedefaultroute" || defaultroute=""

 
        interval="${keepalive##*[, ]}"
        [ "$interval" != "$keepalive" ] || interval=5
 
        interval="${keepalive##*[, ]}"
        [ "$interval" != "$keepalive" ] || interval=5


@@ -34,13 +41,14 @@ start_pppd() {
                ${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} \
                ${demand:+precompiled-active-filter /etc/ppp/filter demand idle }${demand:-persist} \
                usepeerdns \
                ${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} \
                ${demand:+precompiled-active-filter /etc/ppp/filter demand idle }${demand:-persist} \
                usepeerdns \

-               defaultroute \
-               replacedefaultroute \
+               $defaultroute \

                ${username:+user "$username" password "$password"} \
                ${username:+user "$username" password "$password"} \

+               unit "$unit" \

                linkname "$cfg" \
                ipparam "$cfg" \
                ${connect:+connect "$connect"} \
                linkname "$cfg" \
                ipparam "$cfg" \
                ${connect:+connect "$connect"} \

-               ${disconnect:+disconnect "$disconnect"}
+               ${disconnect:+disconnect "$disconnect"} \
+               ${pppd_options}

 
        lock -u "/var/lock/ppp-${cfg}"
 }
 
        lock -u "/var/lock/ppp-${cfg}"
 }