From owner-svn-src-user@FreeBSD.ORG Mon Sep 12 01:38:25 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 04B0E106564A;
Mon, 12 Sep 2011 01:38:25 +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 E88588FC12;
Mon, 12 Sep 2011 01:38:24 +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 p8C1cOJm004567;
Mon, 12 Sep 2011 01:38:24 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8C1cOYn004565;
Mon, 12 Sep 2011 01:38:24 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201109120138.p8C1cOYn004565@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Mon, 12 Sep 2011 01:38:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r225499 - user/hrs/ipv6/etc/rc.d
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Sep 2011 01:38:25 -0000
Author: hrs
Date: Mon Sep 12 01:38:24 2011
New Revision: 225499
URL: http://svn.freebsd.org/changeset/base/225499
Log:
Use resolvconf(8) to create /etc/resolv.conf.
Modified:
user/hrs/ipv6/etc/rc.d/resolv
Modified: user/hrs/ipv6/etc/rc.d/resolv
==============================================================================
--- user/hrs/ipv6/etc/rc.d/resolv Mon Sep 12 01:36:54 2011 (r225498)
+++ user/hrs/ipv6/etc/rc.d/resolv Mon Sep 12 01:38:24 2011 (r225499)
@@ -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