From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 23 Sep 2011 08:36:40 +0000 (+0000)
Subject: [backfire] merge r28291
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=3b1315b98de1925ccc1cca32e4277e511e33641f

[backfire] merge r28291

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@28292 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index ff00fb4a8..26a3c0c46 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=43.27
+PKG_RELEASE:=43.28
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host
diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index 0892282dd..b73c92e90 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -106,7 +106,7 @@ add_dns() {
 	local dns
 	local add
 	for dns in "$@"; do
-		grep -qsF "nameserver $dns" /tmp/resolv.conf.auto || {
+		grep -qsE "^nameserver ${dns//./\\.}$" /tmp/resolv.conf.auto || {
 			add="${add:+$add }$dns"
 			echo "nameserver $dns" >> /tmp/resolv.conf.auto
 		}
@@ -126,7 +126,7 @@ remove_dns() {
 		[ -f /tmp/resolv.conf.auto ] && {
 			local dns=$(uci_get_state network "$cfg" resolv_dns)
 			for dns in $dns; do
-				sed -i -e "/^nameserver $dns$/d" /tmp/resolv.conf.auto
+				sed -i -e "/^nameserver ${dns//./\\.}$/d" /tmp/resolv.conf.auto
 			done
 		}