From owner-svn-src-head@FreeBSD.ORG  Fri Mar 18 12:18:53 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1A0991065670;
	Fri, 18 Mar 2011 12:18:53 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E35938FC12;
	Fri, 18 Mar 2011 12:18:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2ICIqpj066424;
	Fri, 18 Mar 2011 12:18:52 GMT (envelope-from ume@svn.freebsd.org)
Received: (from ume@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2ICIqWW066420;
	Fri, 18 Mar 2011 12:18:52 GMT (envelope-from ume@svn.freebsd.org)
Message-Id: <201103181218.p2ICIqWW066420@svn.freebsd.org>
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Fri, 18 Mar 2011 12:18:52 +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: r219738 - in head: etc/mtree sbin sbin/resolvconf
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Mar 2011 12:18:53 -0000

Author: ume
Date: Fri Mar 18 12:18:52 2011
New Revision: 219738
URL: http://svn.freebsd.org/changeset/base/219738

Log:
  Add resolvconf(8) which manages resolv.conf.

Added:
  head/sbin/resolvconf/
  head/sbin/resolvconf/Makefile   (contents, props changed)
Modified:
  head/etc/mtree/BSD.root.dist
  head/sbin/Makefile

Modified: head/etc/mtree/BSD.root.dist
==============================================================================
--- head/etc/mtree/BSD.root.dist	Fri Mar 18 12:13:04 2011	(r219737)
+++ head/etc/mtree/BSD.root.dist	Fri Mar 18 12:18:52 2011	(r219738)
@@ -72,6 +72,8 @@
         ..
     ..
     libexec
+        resolvconf
+        ..
     ..
     media
     ..

Modified: head/sbin/Makefile
==============================================================================
--- head/sbin/Makefile	Fri Mar 18 12:13:04 2011	(r219737)
+++ head/sbin/Makefile	Fri Mar 18 12:18:52 2011	(r219738)
@@ -62,6 +62,7 @@ SUBDIR=adjkerntz \
 	rcorder \
 	reboot \
 	recoverdisk \
+	resolvconf \
 	restore \
 	route \
 	savecore \

Added: head/sbin/resolvconf/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sbin/resolvconf/Makefile	Fri Mar 18 12:18:52 2011	(r219738)
@@ -0,0 +1,37 @@
+# $FreeBSD$
+
+DIST=		${.CURDIR}/../../contrib/openresolv
+.PATH:		${DIST}
+
+SCRIPTS=	resolvconf
+
+FILES=		libc dnsmasq named pdnsd unbound
+FILESDIR=	/libexec/resolvconf
+
+MAN=		resolvconf.conf.5 resolvconf.8
+
+CLEANFILES=	${SCRIPTS} ${FILES} ${MAN}
+
+SYSCONFDIR=	/etc
+RCDIR=		${SYSCONFDIR}/rc.d
+VARDIR=		/var/run/resolvconf
+
+# We don't assume to restart the services in /sbin.  So, though
+# our service(8) is in /usr/sbin, we can use it, here.
+CMD1=		\1 onestatus >/dev/null 2>\&1
+CMD2=		\1 restart
+RESTARTCMD=	/usr/sbin/service ${CMD1} \&\& /usr/sbin/service ${CMD2}
+
+.for f in ${SCRIPTS} ${FILES} ${MAN}
+${f}:	${f}.in
+	sed -e 's:@PREFIX@::g' \
+		-e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' \
+		-e 's:@LIBEXECDIR@:${FILESDIR}:g' \
+		-e 's:@VARDIR@:${VARDIR}:g' \
+		-e 's:@RESTARTCMD \(.*\)@:${RESTARTCMD}:g' \
+		-e 's:@RCDIR@:${RCDIR}:g' \
+		-e 's: vpn : ng[0-9]*&:g' \
+		${DIST}/$@.in > $@
+.endfor
+
+.include <bsd.prog.mk>