Date: Fri, 18 Mar 2011 12:18:52 +0000 (UTC) From: Hajimu UMEMOTO <ume@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r219738 - in head: etc/mtree sbin sbin/resolvconf Message-ID: <201103181218.p2ICIqWW066420@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103181218.p2ICIqWW066420>