From owner-svn-src-all@FreeBSD.ORG  Mon Sep 19 15:56:50 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A31D31065670;
	Mon, 19 Sep 2011 15:56:50 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 93B008FC14;
	Mon, 19 Sep 2011 15:56:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p8JFuoVX086463;
	Mon, 19 Sep 2011 15:56:50 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8JFuoLf086461;
	Mon, 19 Sep 2011 15:56:50 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201109191556.p8JFuoLf086461@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Mon, 19 Sep 2011 15:56:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225670 - head/etc/rc.d
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Sep 2011 15:56:50 -0000

Author: hrs
Date: Mon Sep 19 15:56:50 2011
New Revision: 225670
URL: http://svn.freebsd.org/changeset/base/225670

Log:
  Use resolvconf(8) to create /etc/resolv.conf, not directly overwrite it.
  
  Approved by:	re (kib)

Modified:
  head/etc/rc.d/resolv

Modified: head/etc/rc.d/resolv
==============================================================================
--- head/etc/rc.d/resolv	Mon Sep 19 15:55:53 2011	(r225669)
+++ head/etc/rc.d/resolv	Mon Sep 19 15:56:50 2011	(r225670)
@@ -28,7 +28,7 @@
 #
 
 # PROVIDE: resolv
-# REQUIRE: netif
+# REQUIRE: netif var
 # KEYWORD: nojail
 
 . /etc/rc.subr
@@ -41,17 +41,17 @@ load_rc_config $name
 # if the info is available via dhcp/kenv
 # build the resolv.conf
 #
-if [ ! -e /etc/resolv.conf -a \
-    -n "`/bin/kenv dhcp.domain-name-servers 2> /dev/null`" ]; then
-	> /etc/resolv.conf
-
+if [ -n "`/bin/kenv dhcp.domain-name-servers 2> /dev/null`" ]; then
+	interface="`/bin/kenv boot.netif.name`"
+	(
 	if [ -n "`/bin/kenv dhcp.domain-name 2> /dev/null`" ]; then
-		echo domain `/bin/kenv dhcp.domain-name` > /etc/resolv.conf
+		echo domain `/bin/kenv dhcp.domain-name`
 	fi
 
 	set -- `/bin/kenv dhcp.domain-name-servers`
 	for ns in `IFS=','; echo $*`; do
-		echo nameserver $ns >> /etc/resolv.conf;
+		echo nameserver $ns
 	done
+	) | /sbin/resolvconf -a ${interface}:dhcp4
 fi