diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-05-14 20:58:24 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-05-14 20:58:24 +0000 |
| commit | e8fa94daa4e7116258ed938bb6e675d0ecc9784b (patch) | |
| tree | 1780dd40d64f479960b88b2e2b3da0b4c15361f5 /package | |
| parent | 3ee1a3abf0b08a05bfccabc81d72f6d9c825e835 (diff) | |
| download | upstream-e8fa94daa4e7116258ed938bb6e675d0ecc9784b.tar.gz upstream-e8fa94daa4e7116258ed938bb6e675d0ecc9784b.tar.bz2 upstream-e8fa94daa4e7116258ed938bb6e675d0ecc9784b.zip | |
ppp: use the new json_get_vars function
SVN-Revision: 31726
Diffstat (limited to 'package')
| -rwxr-xr-x | package/ppp/files/ppp.sh | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh index 5f549bf6e1..c516691329 100755 --- a/package/ppp/files/ppp.sh +++ b/package/ppp/files/ppp.sh @@ -25,20 +25,14 @@ ppp_generic_init_config() { ppp_generic_setup() { local config="$1"; shift - json_get_var ipv6 ipv6 + json_get_vars ipv6 peerdns defaultroute demand keepalive username password pppd_options [ "$ipv6" = 1 ] || ipv6="" - - json_get_var peerdns peerdns [ "$peerdns" = 0 ] && peerdns="" || peerdns="1" - - json_get_var defaultroute defaultroute if [ "$defaultroute" = 1 ]; then defaultroute="defaultroute replacedefaultroute"; else defaultroute="nodefaultroute" fi - - json_get_var demand demand if [ "${demand:-0}" -gt 0 ]; then demand="precompiled-active-filter /etc/ppp/filter demand idle $demand" else @@ -47,16 +41,10 @@ ppp_generic_setup() { [ -n "$mtu" ] || json_get_var mtu mtu - json_get_var keepalive keepalive local interval="${keepalive##*[, ]}" [ "$interval" != "$keepalive" ] || interval=5 - - json_get_var username username - json_get_var password password - [ -n "$connect" ] || json_get_var connect connect [ -n "$disconnect" ] || json_get_var disconnect disconnect - json_get_var pppd_options pppd_options proto_run_command "$config" /usr/sbin/pppd \ nodetach ipparam "$config" \ @@ -155,11 +143,8 @@ proto_pppoa_setup() { /sbin/insmod $module 2>&- >&- done - json_get_var atmdev atmdev - json_get_var vci vci - json_get_var vpi vpi + json_get_vars atmdev vci vpi encaps - json_get_var encaps encaps case "$encaps" in 1|vc) encaps="vc-encaps" ;; *) encaps="llc-encaps" ;; |