diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-12-06 18:22:07 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-12-06 18:22:07 +0000 |
| commit | 3311f0c472819091260898939642a43ba720a5c8 (patch) | |
| tree | d0066513e2ae4477f2064518fdaefa9caf2742b7 /package | |
| parent | d3f5022331d85add41d90b149415e51897969fb6 (diff) | |
| download | upstream-3311f0c472819091260898939642a43ba720a5c8.tar.gz upstream-3311f0c472819091260898939642a43ba720a5c8.tar.bz2 upstream-3311f0c472819091260898939642a43ba720a5c8.zip | |
AA: ppp: backport r34536
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@34538 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/ppp/Makefile | 2 | ||||
| -rwxr-xr-x | package/ppp/files/ppp.sh | 15 |
2 files changed, 5 insertions, 12 deletions
diff --git a/package/ppp/Makefile b/package/ppp/Makefile index e9a1e9c82b..d7eddbc818 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ppp PKG_VERSION:=2.4.5 -PKG_RELEASE:=7 +PKG_RELEASE:=8 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/ diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh index 7e9b8dd856..43a7de9658 100755 --- a/package/ppp/files/ppp.sh +++ b/package/ppp/files/ppp.sh @@ -16,8 +16,6 @@ ppp_generic_init_config() { proto_config_add_string "pppd_options" proto_config_add_string "connect" proto_config_add_string "disconnect" - proto_config_add_boolean "defaultroute" - proto_config_add_boolean "peerdns" proto_config_add_boolean "ipv6" proto_config_add_boolean "authfail" proto_config_add_int "mtu" @@ -26,14 +24,8 @@ ppp_generic_init_config() { ppp_generic_setup() { local config="$1"; shift - json_get_vars ipv6 peerdns defaultroute demand keepalive username password pppd_options + json_get_vars ipv6 demand keepalive username password pppd_options [ "$ipv6" = 1 ] || ipv6="" - [ "$peerdns" = 0 ] && peerdns="" || peerdns="1" - if [ "$defaultroute" = 1 ]; then - defaultroute="defaultroute replacedefaultroute"; - else - defaultroute="nodefaultroute" - fi if [ "${demand:-0}" -gt 0 ]; then demand="precompiled-active-filter /etc/ppp/filter demand idle $demand" else @@ -51,8 +43,9 @@ ppp_generic_setup() { nodetach ipparam "$config" \ ifname "${proto:-ppp}-$config" \ ${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} \ - ${ipv6:++ipv6} $defaultroute \ - ${peerdns:+usepeerdns} \ + ${ipv6:++ipv6} \ + nodefaultroute \ + usepeerdns \ $demand maxfail 1 \ ${username:+user "$username" password "$password"} \ ${connect:+connect "$connect"} \ |