hurricos/openwrt-mirror
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-11-03 22:44:27 -05:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
SVN-Revision: 29694
This commit is contained in:
Jo-Philipp Wich 2012-01-08 15:41:34 +00:00
parent df57c5fdde
commit 7251541786
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/pptp/Makefile
View File

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=pptp PKG_NAME:=pptp
PKG_VERSION:=1.7.1 PKG_VERSION:=1.7.1
PKG_RELEASE:=4 PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/pptpclient PKG_SOURCE_URL:=@SF/pptpclient

4
package/pptp/files/pptp.sh
View File

@ -24,9 +24,6 @@ setup_interface_pptp() {
local device local device
config_get device "$config" device config_get device "$config" device
local ipproto
config_get ipproto "$config" ipproto
local server local server
config_get server "$config" server config_get server "$config" server
@ -39,7 +36,6 @@ setup_interface_pptp() {
done done
sleep 1 sleep 1
setup_interface "$device" "$config" "${ipproto:-dhcp}"
local gw="$(find_gw)" local gw="$(find_gw)"
[ -n "$gw" ] && { [ -n "$gw" ] && {
local serv_addrs="" local serv_addrs=""