add pppd options patch from #2114

[openwrt/svn-archive/archive.git] / package / ppp / files / ppp.sh

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 5eb007d..507f453 100644 (file)
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -3,10 +3,6 @@ scan_ppp() {
        pppdev="${pppdev:-0}"
        config_set "$1" ifname "ppp$pppdev"
        config_set "$1" unit "$pppdev"
        pppdev="${pppdev:-0}"
        config_set "$1" ifname "ppp$pppdev"
        config_set "$1" unit "$pppdev"

-       
-       # set 'auto' to 0, so that hotplug does not attempt to
-       # reconfigure an interface that is managed by pppd
-       config_set "$1" auto 0

 }
 
 start_pppd() {
 }
 
 start_pppd() {


@@ -25,6 +21,11 @@ start_pppd() {
        config_get username "$cfg" username
        config_get password "$cfg" password
        config_get keepalive "$cfg" keepalive
        config_get username "$cfg" username
        config_get password "$cfg" password
        config_get keepalive "$cfg" keepalive

+
+       config_get connect "$cfg" connect
+       config_get disconnect "$cfg" disconnect
+       config_get pppd_options "$cfg" pppd_options
+

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


@@ -38,7 +39,24 @@ start_pppd() {
                replacedefaultroute \
                ${username:+user "$username" password "$password"} \
                linkname "$cfg" \
                replacedefaultroute \
                ${username:+user "$username" password "$password"} \
                linkname "$cfg" \

-               ipparam "$cfg"
+               ipparam "$cfg" \
+               ${connect:+connect "$connect"} \
+               ${disconnect:+disconnect "$disconnect"} \
+               ${pppd_options}

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

+
+setup_interface_ppp() {
+       local iface="$1"
+       local config="$2"
+
+       config_get device "$config" device
+
+       config_get mtu "$cfg" mtu
+       mtu=${mtu:-1492}
+       start_pppd "$config" \
+               mtu $mtu mru $mtu \
+               "$device"
+}
+