From owner-freebsd-current@FreeBSD.ORG Fri Jul 9 21:15:08 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9B0C9106564A for ; Fri, 9 Jul 2010 21:15:08 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 6C69D8FC12 for ; Fri, 9 Jul 2010 21:15:08 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id AAF2F46BA3 for ; Fri, 9 Jul 2010 17:15:07 -0400 (EDT) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 158098A03C for ; Fri, 9 Jul 2010 17:15:07 -0400 (EDT) From: John Baldwin To: freebsd-current@freebsd.org Date: Fri, 9 Jul 2010 17:15:03 -0400 User-Agent: KMail/1.13.5 (FreeBSD/7.3-CBSD-20100217; KDE/4.4.5; amd64; ; ) References: <201006101346.59824.jhb@freebsd.org> <201007091621.51288.jhb@freebsd.org> In-Reply-To: <201007091621.51288.jhb@freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201007091715.03922.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Fri, 09 Jul 2010 17:15:07 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.6 required=4.2 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx Subject: Re: RFC: etcupdate tool in base? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Jul 2010 21:15:08 -0000 On Friday, July 09, 2010 4:21:51 pm John Baldwin wrote: > On Thursday, June 10, 2010 1:46:59 pm John Baldwin wrote: > > I've had several folks ask me recently about importing etcupdate > > (http://www.FreeBSD.org/~jhb/etcupdate) into the base system as an alternate > > tool for updating /etc during upgrades. Do folks have any strong objections > > to doing so? More details about how it works and an HTML version of the > > manpage can be found at the URL above. > > I finally committed a port to ports/sysutils/etcupdate for this today. If at > some point lots of folks call for an import we can revisit this then. One > small advantage of importing is that we could have make release automatically > bootstrap it similar to how we do now for mtree databases (I do this in my > FooBSD at work, it is a one-line patch to the release Makefile). For those who are interested, here is the patch to src/release/Makefile. This assumes that etcupdate is available in the chroot during 'make release'. I do this in my FooBSD by having it be part of the base system. Index: release/Makefile =================================================================== --- release/Makefile (.../mirror/FreeBSD/stable/7) (revision 210305) +++ release/Makefile (.../stable/7) (revision 210305) @@ -648,6 +651,8 @@ cd ${.CURDIR}/.. && ${CROSSMAKE} distrib-dirs DESTDIR=${RD}/trees/base cd ${.CURDIR}/.. && ${CROSSMAKE} ${WORLD_FLAGS} distributeworld \ DISTDIR=${RD}/trees + etcupdate extract -B -d "${RD}/trees/base/var/db/etcupdate" \ + -M "${CROSSENV}" sh ${.CURDIR}/scripts/mm-mtree.sh -F "${CROSSENV}" -D "${RD}/trees/base" touch ${.TARGET} -- John Baldwin