diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-01-08 21:33:53 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-01-08 21:33:53 +0000 |
| commit | 656412d1a3806d94b280a9955df528faad6aa8e9 (patch) | |
| tree | 012a0788f3f546b5540756e0ee6a57aa223319b7 /package/dnsmasq/files | |
| parent | cd10aa726f1803513f172fff4c194a3cdcb868a3 (diff) | |
| download | upstream-656412d1a3806d94b280a9955df528faad6aa8e9.tar.gz upstream-656412d1a3806d94b280a9955df528faad6aa8e9.tar.bz2 upstream-656412d1a3806d94b280a9955df528faad6aa8e9.zip | |
Forward port whiterussian resolv.conf changes /etc/resolv.conf links to /tmp/resolv.conf /tmp/resolv.conf links to /tmp/resolv.conf.auto by default (which is where the ISPs nameserver is in) When dnsmasq starts, it replaces /tmp/resolv.conf with a file pointing to 127.0.0.1
SVN-Revision: 6043
Diffstat (limited to 'package/dnsmasq/files')
| -rw-r--r-- | package/dnsmasq/files/dnsmasq.conf | 2 | ||||
| -rw-r--r-- | package/dnsmasq/files/dnsmasq.init | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/package/dnsmasq/files/dnsmasq.conf b/package/dnsmasq/files/dnsmasq.conf index 8a51f8445d..8a8191b635 100644 --- a/package/dnsmasq/files/dnsmasq.conf +++ b/package/dnsmasq/files/dnsmasq.conf @@ -8,7 +8,7 @@ localise-queries local=/lan/ domain=lan expand-hosts -resolv-file=/tmp/resolv.conf +resolv-file=/tmp/resolv.conf.auto @ifdef dhcp_enable dhcp-range=@@start@@,@@end@@,@@netmask@@,@@lease@@ diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init index 7afcee420e..5e72fd014f 100644 --- a/package/dnsmasq/files/dnsmasq.init +++ b/package/dnsmasq/files/dnsmasq.init @@ -50,7 +50,13 @@ start() { [ -z "$wan_proto" -o "$wan_proto" = "none" ] || echo "@define wan_ifname $wan_ifname" cat /etc/dnsmasq.conf - ) | awk -f /lib/config/template.awk | dnsmasq -C /proc/self/fd/0 + ) | awk -f /lib/config/template.awk | dnsmasq -C /proc/self/fd/0 && { + rm -f /tmp/resolv.conf + cat > /tmp/resolv.conf <<EOF +nameserver 127.0.0.1 +search lan +EOF + } } stop() { |