From c4fa115e5ca6b90ea2c1cd36f0876818c6281200 Mon Sep 17 00:00:00 2001 From: Travis Kemen Date: Mon, 10 Sep 2007 20:24:18 +0000 Subject: [PATCH] add fix from ticket #2290 SVN-Revision: 8732 --- package/dnsmasq/files/dnsmasq.init | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init index c39e58417f..cd5697c772 100644 --- a/package/dnsmasq/files/dnsmasq.init +++ b/package/dnsmasq/files/dnsmasq.init @@ -2,6 +2,7 @@ # Copyright (C) 2007 OpenWrt.org START=60 +DNS_SERVERS="" dhcp_calc() { local ip="$1" @@ -173,6 +174,11 @@ dhcp_add() { config_get ifname "$net" ifname [ -n "$ifname" ] || return 0 + config_get dnsserver "$net" dns + [ -n "$dnsserver" ] && { + DNS_SERVERS="$DNS_SERVERS $dnsserver" + } + append_bool "$cfg" ignore "-I $ifname" config_get proto "$net" proto @@ -234,10 +240,10 @@ start() { /usr/sbin/dnsmasq $args && { rm -f /tmp/resolv.conf - cat > /tmp/resolv.conf <> /tmp/resolv.conf + done } } -- 2.25.1