From owner-svn-src-all@FreeBSD.ORG Fri Jul 13 14:42:08 2012 Return-Path: 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 AE8EA106566B; Fri, 13 Jul 2012 14:42:08 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (bigknife-pt.tunnel.tserv9.chi1.ipv6.he.net [IPv6:2001:470:1f10:75::2]) by mx1.freebsd.org (Postfix) with ESMTP id 82F9B8FC16; Fri, 13 Jul 2012 14:42:08 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 030D6B94A; Fri, 13 Jul 2012 10:42:08 -0400 (EDT) From: John Baldwin To: src-committers@freebsd.org Date: Fri, 13 Jul 2012 09:30:15 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p17; KDE/4.5.5; amd64; ; ) References: <201207131323.q6DDNnFK071126@svn.freebsd.org> In-Reply-To: <201207131323.q6DDNnFK071126@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201207130930.15964.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Fri, 13 Jul 2012 10:42:08 -0400 (EDT) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org Subject: Re: svn commit: r238423 - in head: tools/regression/usr.sbin/etcupdate usr.sbin usr.sbin/etcupdate 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2012 14:42:08 -0000 On Friday, July 13, 2012 9:23:48 am John Baldwin wrote: > Author: jhb > Date: Fri Jul 13 13:23:48 2012 > New Revision: 238423 > URL: http://svn.freebsd.org/changeset/base/238423 > > Log: > The etcupdate utility is a tool for managing updates to files that are > not updated as part of `make installworld' such as files in /etc. It > manages updates by doing a three-way merge of changes made to these files > against the local versions. It is also designed to minimize the amount > of user intervention with the goal of simplifying upgrades for clusters > of machines. > > The primary difference from mergemaster is that etcupdate requires less > manual work. The primary difference from etcmerge is that etcupdate > updates files in-place similar to mergemaster rather than building a > separate /etc tree. > > Requested by: obrien, kib, theraven, joeld (among others) A primary reason for importing this is to make it easier for folks to use out of the box. I have an (untested) patch to update the release build to include a bootstrap of etcupdate out-of-the-box. Once that is tested I'll commit it. I have been using a similar patch for old-style releases on 7 and 8 for many years now at work. Index: release/Makefile =================================================================== --- Makefile (revision 238365) +++ Makefile (working copy) @@ -71,6 +71,9 @@ base.txz: # Set up mergemaster root database sh ${.CURDIR}/scripts/mm-mtree.sh -m ${WORLDDIR} -F \ "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" -D "${.OBJDIR}/${DISTDIR}/base" +# Bootstrap etcupdate + etcupdate extract -B -d "${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate" \ + -M "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" # Package all components cd ${WORLDDIR} && ${IMAKE} packageworld DISTDIR=${.OBJDIR}/${DISTDIR} mv ${DISTDIR}/*.txz . -- John Baldwin