X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fnetwork%2Fservices%2Fppp%2Ffiles%2Fppp.sh;h=02b40558ca0059bd8eb0e52b325fe2d563d21c15;hb=a6728a1874faa2bbef7f92f345bf5af1f285847f;hp=7e9b8dd8562a564ff4e8ec568a1c7ddac6764ca0;hpb=9c8997d54dc9df184bfcedeabf0b3c85cf5e6753;p=openwrt.git

diff --git a/package/network/services/ppp/files/ppp.sh b/package/network/services/ppp/files/ppp.sh
index 7e9b8dd856..02b40558ca 100755
--- a/package/network/services/ppp/files/ppp.sh
+++ b/package/network/services/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"} \
@@ -197,7 +190,7 @@ proto_pptp_setup() {
 
 	local load
 	for module in slhc ppp_generic ppp_async ppp_mppe ip_gre gre pptp; do
-		grep -q "$module" /proc/modules && continue
+		grep -q "^$module " /proc/modules && continue
 		/sbin/insmod $module 2>&- >&-
 		load=1
 	done