From 194b5d210ca107ce32e7a130766d8c4b68d2da07 Mon Sep 17 00:00:00 2001
From: dougb <dougb@FreeBSD.org>
Date: Wed, 24 Oct 2007 21:36:09 +0000
Subject: [PATCH] MFC revisions 1.13 of NETWORKING and 1.37 of resolv: 1. Make
 resolv order deterministic by REQUIRE'ing it in NETWORKING, and having resolv
 REQUIRE netif. 2. Tighten up the code and fix whitespace in resolv

---
 etc/rc.d/NETWORKING |  2 +-
 etc/rc.d/resolv     | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/etc/rc.d/NETWORKING b/etc/rc.d/NETWORKING
index 504ca4cc8a07..729b31692b99 100644
--- a/etc/rc.d/NETWORKING
+++ b/etc/rc.d/NETWORKING
@@ -6,7 +6,7 @@
 
 # PROVIDE: NETWORKING NETWORK
 # REQUIRE: netif netoptions routing network_ipv6 isdnd ppp
-# REQUIRE: routed mrouted route6d mroute6d
+# REQUIRE: routed mrouted route6d mroute6d resolv
 
 #	This is a dummy dependency, for services which require networking
 #	to be operational before starting.
diff --git a/etc/rc.d/resolv b/etc/rc.d/resolv
index 08e775f0ee5d..3acf320e48cf 100644
--- a/etc/rc.d/resolv
+++ b/etc/rc.d/resolv
@@ -28,6 +28,7 @@
 #
 
 # PROVIDE: resolv
+# REQUIRE: netif
 # KEYWORD: nojail
 
 . /etc/rc.subr
@@ -41,15 +42,15 @@ load_rc_config $name
 #
 if [ ! -e /etc/resolv.conf -a \
     -n "`/bin/kenv dhcp.domain-name-servers 2> /dev/null`" ]; then
-	/bin/cat /dev/null > /etc/resolv.conf
+	> /etc/resolv.conf
 
 	if [ -n "`/bin/kenv dhcp.domain-name 2> /dev/null`" ]; then
 		echo domain `/bin/kenv dhcp.domain-name` > /etc/resolv.conf
 	fi
 
-        set -- `/bin/kenv dhcp.domain-name-servers`
-        for ns in `IFS=','; echo $*`; do
-                echo nameserver $ns >> /etc/resolv.conf;
-        done
+	set -- `/bin/kenv dhcp.domain-name-servers`
+	for ns in `IFS=','; echo $*`; do
+		echo nameserver $ns >> /etc/resolv.conf;
+	done
 fi