From 523b5bd74bd0233617ecebe7137cc323d1b4856c Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 30 Sep 2009 16:08:03 +0000 Subject: [PATCH] [8.09] merge r17801 SVN-Revision: 17802 --- package/ppp/Makefile | 2 +- package/ppp/files/etc/ppp/ip-up | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 1c9ce14d61..44fc13766c 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ppp PKG_VERSION:=2.4.3 -PKG_RELEASE:=11.2 +PKG_RELEASE:=11.3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/ diff --git a/package/ppp/files/etc/ppp/ip-up b/package/ppp/files/etc/ppp/ip-up index 46c8d37700..ecdd00b1c4 100755 --- a/package/ppp/files/etc/ppp/ip-up +++ b/package/ppp/files/etc/ppp/ip-up @@ -13,6 +13,9 @@ export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM uci_set_state network "$PPP_IPPARAM" unit "$PPP_UNIT" uci_set_state network "$PPP_IPPARAM" ipaddr "$PPP_LOCAL" uci_set_state network "$PPP_IPPARAM" gateway "$PPP_REMOTE" + + local dns="$DNS1${DNS2:+ $DNS2}" + [ -n "$dns" ] && uci_set_state network "$PPP_IPPARAM" dns "$dns" } [ -z "$PPP_IPPARAM" ] || env -i ACTION="ifup" INTERFACE="$PPP_IPPARAM" DEVICE="$PPP_IFACE" PROTO=ppp /sbin/hotplug-call "iface" -- 2.30.2