From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 8 Jan 2012 15:41:34 +0000 (+0000)
Subject: pptp: remove support for underlying ipproto, it is adviced since a while that pptp... 
X-Git-Tag: reboot~15203
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7251541786075324a1e11f5d06cfa2ebe2d97a91;p=openwrt%2Fstaging%2Fpepe2k.git

pptp: remove support for underlying ipproto, it is adviced since a while that pptp should be declared as separate interface alognside wan - in this configuration the ipproto will cause stray udhcpc errors due to not existent interfaces, so remove it

SVN-Revision: 29694
---

diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index 08f6b40aa3..a6d213d387 100644
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pptp
 PKG_VERSION:=1.7.1
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/pptpclient
diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
index 7efbb02fb8..19023e7ef4 100644
--- a/package/pptp/files/pptp.sh
+++ b/package/pptp/files/pptp.sh
@@ -24,9 +24,6 @@ setup_interface_pptp() {
 	local device
 	config_get device "$config" device
 
-	local ipproto
-	config_get ipproto "$config" ipproto
-
 	local server
 	config_get server "$config" server
 
@@ -39,7 +36,6 @@ setup_interface_pptp() {
 	done
 	sleep 1
 
-	setup_interface "$device" "$config" "${ipproto:-dhcp}"
 	local gw="$(find_gw)"
 	[ -n "$gw" ] && {
 		local serv_addrs=""