From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 27 Aug 2007 16:37:37 +0000 (+0000)
Subject: allow the user to override the underlying connection method when using pptp (defaults... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=79b07af6945064e53ad7c3f0920dabd73cdbd161;p=openwrt%2Fstaging%2Fneocturne.git

allow the user to override the underlying connection method when using pptp (defaults to dhcp)

SVN-Revision: 8508
---

diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
index c61bdc0206..4d03af0085 100644
--- a/package/pptp/files/pptp.sh
+++ b/package/pptp/files/pptp.sh
@@ -7,11 +7,12 @@ setup_interface_pptp() {
 	local config="$2"
 	
 	config_get device "$config" device
+	config_get ipproto "$config" ipproto
 
 	for module in slhc ppp_generic ppp_async ip_gre; do
 		/sbin/insmod $module 2>&- >&-
 	done
-	setup_interface "$iface" "$config" "dhcp"
+	setup_interface "$iface" "$config" "${ipproto:-dhcp}"
 
 	config_get mtu "$cfg" mtu
 	config_get server "$cfg" server