From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 27 Oct 2006 01:47:16 +0000 (+0000)
Subject: change the way resolv.conf is being created, so that it also works when dnsmasq is... 
X-Git-Tag: whiterussian_rc6~53
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ce634e3371b9ab7332b62e95921922650727f636;p=openwrt%2Fsvn-archive%2Fopenwrt.git

change the way resolv.conf is being created, so that it also works when dnsmasq is not started

SVN-Revision: 5305
---

diff --git a/openwrt/package/base-files/Makefile b/openwrt/package/base-files/Makefile
index 30e6cfef23..babe50ae61 100644
--- a/openwrt/package/base-files/Makefile
+++ b/openwrt/package/base-files/Makefile
@@ -51,6 +51,8 @@ $(IPKG_BASE):
 	mkdir -p $(IDIR_BASE)/usr/bin
 	mkdir -p $(IDIR_BASE)/www
 	rm -f $(IDIR_BASE)/var
+	rm -f $(IDIR_BASE)/etc/resolv.conf
+	ln -sf /tmp/resolv.conf $(IDIR_BASE)/etc/resolv.conf
 	ln -sf /tmp $(IDIR_BASE)/var
 	-find $(IDIR_BASE) -type d -name CVS | xargs rm -rf
 	-find $(IDIR_BASE) -type d -name .svn | xargs rm -rf
diff --git a/openwrt/package/base-files/default/bin/firstboot b/openwrt/package/base-files/default/bin/firstboot
index 02d941fe98..148bc995de 100755
--- a/openwrt/package/base-files/default/bin/firstboot
+++ b/openwrt/package/base-files/default/bin/firstboot
@@ -21,7 +21,6 @@ dupe() { # <new_root> <old_root>
 		case "$file" in
 		./rom/note) ;; #nothing
 		./etc/config*|\
-		./etc/resolv.conf|\
 		./usr/lib/ipkg/info/*) cp -af $2/$file $file;;
 		*) ln -sf /rom/${file#./*} $file;;
 		esac
diff --git a/openwrt/package/base-files/default/etc/functions.sh b/openwrt/package/base-files/default/etc/functions.sh
index 7a3ab6f23e..9fecccf7d4 100755
--- a/openwrt/package/base-files/default/etc/functions.sh
+++ b/openwrt/package/base-files/default/etc/functions.sh
@@ -60,10 +60,10 @@ do_ifup() {
 			} done
 		}
 
-		[ -f /tmp/resolv.conf ] || {
-			debug "# --- creating /tmp/resolv.conf ---"
+		[ -f /tmp/resolv.conf.auto ] || {
+			debug "# --- creating /tmp/resolv.conf.auto ---"
 			for dns in $(nvram get ${2}_dns); do
-				echo "nameserver $dns" >> /tmp/resolv.conf
+				echo "nameserver $dns" >> /tmp/resolv.conf.auto
 			done
 		}
 		
diff --git a/openwrt/package/base-files/default/etc/init.d/S40network b/openwrt/package/base-files/default/etc/init.d/S40network
index 2cae726359..751dae7206 100755
--- a/openwrt/package/base-files/default/etc/init.d/S40network
+++ b/openwrt/package/base-files/default/etc/init.d/S40network
@@ -1,6 +1,8 @@
 #!/bin/sh
 case "$1" in
   start|restart)
+  rm -f /tmp/resolv.conf
+  ln -s /tmp/resolv.conf.auto /tmp/resolv.conf
   ifup_interfaces=$(nvram get ifup_interfaces)
   ifup_interfaces=${ifup_interfaces:-"lan wan wifi"}
   for iface in $ifup_interfaces; do
diff --git a/openwrt/package/base-files/default/etc/resolv.conf b/openwrt/package/base-files/default/etc/resolv.conf
deleted file mode 100644
index 9617eacda7..0000000000
--- a/openwrt/package/base-files/default/etc/resolv.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-nameserver 127.0.0.1
-search lan
diff --git a/openwrt/package/base-files/default/usr/share/udhcpc/default.script b/openwrt/package/base-files/default/usr/share/udhcpc/default.script
index 20d306de4b..cd45644a05 100755
--- a/openwrt/package/base-files/default/usr/share/udhcpc/default.script
+++ b/openwrt/package/base-files/default/usr/share/udhcpc/default.script
@@ -1,7 +1,7 @@
 #!/bin/sh
 [ -z "$1" ] && echo "Error: should be run by udhcpc" && exit 1
 
-RESOLV_CONF="/tmp/resolv.conf"
+RESOLV_CONF="/tmp/resolv.conf.auto"
 
 hotplug_event() {
 	nvram show 2>&- | grep _proto=dhcp | {
diff --git a/openwrt/package/dnsmasq/files/S50dnsmasq b/openwrt/package/dnsmasq/files/S50dnsmasq
index 1c47011d05..1699659ea6 100755
--- a/openwrt/package/dnsmasq/files/S50dnsmasq
+++ b/openwrt/package/dnsmasq/files/S50dnsmasq
@@ -30,4 +30,11 @@ udhcpc -n -q -R -s /bin/true -i $ifname >&- || {
 wanproto=$(nvram get wan_proto)
 [ -z "$wanproto" -o "$wanproto" = "none" ] || args="${args} -I $(nvram get wan_ifname)"
 
-dnsmasq ${args}
+dnsmasq ${args} && {
+	# use dnsmasq for local dns requests
+	rm -f /tmp/resolv.conf
+	cat > /tmp/resolv.conf <<EOF
+nameserver 127.0.0.1
+search lan
+EOF
+}
diff --git a/openwrt/package/dnsmasq/files/dnsmasq.conf b/openwrt/package/dnsmasq/files/dnsmasq.conf
index e43d473686..f40c4aca48 100644
--- a/openwrt/package/dnsmasq/files/dnsmasq.conf
+++ b/openwrt/package/dnsmasq/files/dnsmasq.conf
@@ -9,7 +9,7 @@ local=/lan/
 domain=lan
 expand-hosts
 no-negcache
-resolv-file=/tmp/resolv.conf
+resolv-file=/tmp/resolv.conf.auto
 
 # enable dhcp (start,end,netmask,leasetime)
 dhcp-authoritative
diff --git a/openwrt/package/ppp/Makefile b/openwrt/package/ppp/Makefile
index 79e03c037e..3acbfe6649 100644
--- a/openwrt/package/ppp/Makefile
+++ b/openwrt/package/ppp/Makefile
@@ -88,7 +88,7 @@ endif
 
 $(IPKG_PPP):
 	install -d -m0755 $(IDIR_PPP)/etc/ppp
-	ln -sf /tmp/resolv.conf $(IDIR_PPP)/etc/ppp/resolv.conf
+	ln -sf /tmp/resolv.conf.auto $(IDIR_PPP)/etc/ppp/resolv.conf
 	install -m0600 ./files/etc/ppp/chap-secrets $(IDIR_PPP)/etc/ppp/
 	install -m0644 ./files/etc/ppp/options $(IDIR_PPP)/etc/ppp/
 	$(INSTALL_FILTER)