summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-07-25 18:12:30 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-07-25 18:12:30 +0000
commit37ba07b32c887726aeffa54fb6d3af8665402b25 (patch)
treeb512b980f06587a8f45c522b7c3d1503ebd31d46
parentbcd02c4560c0c035d83cbf70f6bf1ca43425b4fa (diff)
use 127.0.0.1 as dns server and point dnsmasq to /tmp/resolv.conf
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4282 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/base-files/Makefile1
-rw-r--r--package/base-files/default/etc/resolv.conf2
-rw-r--r--package/dnsmasq/files/dnsmasq.conf1
3 files changed, 3 insertions, 1 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 8fccf79ea8..01ea9674c5 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -153,7 +153,6 @@ define Package/base-files$(TARGET)/install
mkdir -p $(1)/usr/bin
mkdir -p $(1)/sys
mkdir -p $(1)/www
- ln -sf /tmp/resolv.conf $(1)/etc/resolv.conf
ln -sf /proc/mounts $(1)/etc/mtab
rm -f $(1)/var
ln -sf /tmp $(1)/var
diff --git a/package/base-files/default/etc/resolv.conf b/package/base-files/default/etc/resolv.conf
new file mode 100644
index 0000000000..9617eacda7
--- /dev/null
+++ b/package/base-files/default/etc/resolv.conf
@@ -0,0 +1,2 @@
+nameserver 127.0.0.1
+search lan
diff --git a/package/dnsmasq/files/dnsmasq.conf b/package/dnsmasq/files/dnsmasq.conf
index 7aed3a3da4..43acd85b15 100644
--- a/package/dnsmasq/files/dnsmasq.conf
+++ b/package/dnsmasq/files/dnsmasq.conf
@@ -8,6 +8,7 @@ localise-queries
local=/lan/
domain=lan
expand-hosts
+resolv-file=/tmp/resolv.conf
@ifdef dhcp_enable
dhcp-range=@@start@@,@@end@@,@@netmask@@,@@lease@@