lua: remove an unnecessary check and replace switch (GET_OPCODE(i)) as well (thx...

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

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 63d8cc4..87872e0 100644 (file)
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -1,9 +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"
-       pppdev="$(($pppdev + 1))"
+       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() {


@@ -17,6 +20,10 @@ start_pppd() {
                return 0
        }
 
                return 0
        }
 

+       # Workaround: sometimes hotplug2 doesn't deliver the hotplug event for creating
+       # /dev/ppp fast enough to be used here
+       [ -e /dev/ppp ] || mknod /dev/ppp c 108 0
+

        config_get device "$cfg" device
        config_get unit "$cfg" unit
        config_get username "$cfg" username
        config_get device "$cfg" device
        config_get unit "$cfg" unit
        config_get username "$cfg" username


@@ -26,24 +33,33 @@ start_pppd() {
        config_get connect "$cfg" connect
        config_get disconnect "$cfg" disconnect
        config_get pppd_options "$cfg" pppd_options
        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

+
+       config_get_bool peerdns "$cfg" peerdns 1 
+       [ "$peerdns" -eq 1 ] && peerdns="usepeerdns" || peerdns="" 

        
        config_get demand "$cfg" demand
        [ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf.auto
        
        config_get demand "$cfg" demand
        [ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf.auto

+
+       config_get_bool ipv6 "$cfg" ipv6 0
+       [ "$ipv6" -eq 1 ] && ipv6="+ipv6" || ipv6=""
+

        /usr/sbin/pppd "$@" \
                ${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} \
                ${demand:+precompiled-active-filter /etc/ppp/filter demand idle }${demand:-persist} \
        /usr/sbin/pppd "$@" \
                ${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} \
                ${demand:+precompiled-active-filter /etc/ppp/filter demand idle }${demand:-persist} \

-               usepeerdns \
-               defaultroute \
-               replacedefaultroute \
+               $peerdns \
+               $defaultroute \

                ${username:+user "$username" password "$password"} \
                unit "$unit" \
                linkname "$cfg" \
                ipparam "$cfg" \
                ${connect:+connect "$connect"} \
                ${disconnect:+disconnect "$disconnect"} \
                ${username:+user "$username" password "$password"} \
                unit "$unit" \
                linkname "$cfg" \
                ipparam "$cfg" \
                ${connect:+connect "$connect"} \
                ${disconnect:+disconnect "$disconnect"} \

+               ${ipv6} \

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