From: Steven Barth <cyrus@openwrt.org>
Date: Mon, 10 Jun 2013 10:42:34 +0000 (+0000)
Subject: ppp: correctly handle address when reloading
X-Git-Tag: reboot~10240
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5caa45d0b396972b313fb3d99908ba978b684570;p=oweals%2Fopenwrt.git

ppp: correctly handle address when reloading

SVN-Revision: 36904
---

diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile
index 9a4640bf1c..d4aab3831f 100644
--- a/package/network/services/ppp/Makefile
+++ b/package/network/services/ppp/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ppp
 PKG_VERSION:=2.4.5
-PKG_RELEASE:=9
+PKG_RELEASE:=10
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/
diff --git a/package/network/services/ppp/files/lib/netifd/ppp-up b/package/network/services/ppp/files/lib/netifd/ppp-up
index d488b8d5f8..fa14550ec4 100755
--- a/package/network/services/ppp/files/lib/netifd/ppp-up
+++ b/package/network/services/ppp/files/lib/netifd/ppp-up
@@ -5,7 +5,7 @@ PPP_IPPARAM="$6"
 proto_init_update "$IFNAME" 1 1
 proto_set_keep 1
 [ -n "$PPP_IPPARAM" ] && {
-	[ -n "$IPLOCAL" ] && proto_add_ipv4_address "$IPLOCAL" 32
+	[ -n "$IPLOCAL" ] && proto_add_ipv4_address "$IPLOCAL" 32 "" "${IPREMOTE:-2.2.2.2}"
 	[ -n "$IPREMOTE" ] && proto_add_ipv4_route 0.0.0.0 0 "$IPREMOTE"
 	[ -n "$LLLOCAL" ] && proto_add_ipv6_address "$LLLOCAL" 128
 	[ -n "$DNS1" ] && proto_add_dns_server "$DNS1"