From owner-svn-src-stable-8@FreeBSD.ORG Wed Aug 20 19:46:22 2014 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 729814B0; Wed, 20 Aug 2014 19:46:22 +0000 (UTC) Received: from smtp2.wemm.org (smtp2.wemm.org [IPv6:2001:470:67:39d::78]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp2.wemm.org", Issuer "StartCom Class 1 Primary Intermediate Server CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 48C7C3ECD; Wed, 20 Aug 2014 19:46:22 +0000 (UTC) Received: from hater-dm.corp.yahoo.com (nat-dip4.cfw-a-gci.corp.yahoo.com [209.131.62.113]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: peter) by smtp2.wemm.org (Postfix) with ESMTPSA id AC85C61E; Wed, 20 Aug 2014 12:46:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wemm.org; s=m20140428; t=1408563981; bh=dqfwsxeBkpqCduWa8xBm7buCewmXOqOwB/Su1ui05z8=; h=Date:From:To:Subject:References:In-Reply-To; b=vmNh8GTpc/fr/t8r8fVrUe6FBVFXA+sPu9Dk6+IzXAlRy4bDaYjHaCqNRL5T2AEan 5oQe8lP0gqxDhew/KoypGCS+zCaYt5J3DXn67FDMEjJ4XZs5hld42gR1tuiV+1saRB WoBy+3PHnBoEe0ilmXRwNVqP9Z+glwqfgA/qXQv0= Message-ID: <53F4FB0D.9080605@wemm.org> Date: Wed, 20 Aug 2014 12:46:21 -0700 From: Peter Wemm User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: John Baldwin , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: Re: svn commit: r270177 - in stable/8: tools/regression/usr.sbin/etcupdate usr.sbin usr.sbin/etcupdate References: <201408191754.s7JHsF2M069832@svn.freebsd.org> In-Reply-To: <201408191754.s7JHsF2M069832@svn.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="1vP3RQMNbRmQcqpvKXDiLgWhDuUU8Seeu" X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Aug 2014 19:46:22 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --1vP3RQMNbRmQcqpvKXDiLgWhDuUU8Seeu Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 8/19/14 10:54 AM, John Baldwin wrote: > Author: jhb > Date: Tue Aug 19 17:54:15 2014 > New Revision: 270177 > URL: http://svnweb.freebsd.org/changeset/base/270177 >=20 > Log: > MFC 238423,238426,238428,258063,258064,258066,258097,258185,259134: > The etcupdate utility is a tool for managing updates to files that ar= e > 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 f= iles > against the local versions. It is also designed to minimize the amou= nt > of user intervention with the goal of simplifying upgrades for cluste= rs > of machines. > =20 > Requested by: peter Much appreciated, thanks! We're making a serious effort at streamlining the cluster refresh process= and etcupdate seems to fit the bill nicely for upgrading src-less systems= =2E We have freebsd/8.x machines in the mix so this eliminates a whole bunch= of script exceptions. etcupdate is so much nicer than mergemaster when dealing with *many* systems. To paraphrase twitter: mergemaster: i enter i enter i enter ... i enter i enter OH CRAP! --=20 Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com; KI6F= JV --1vP3RQMNbRmQcqpvKXDiLgWhDuUU8Seeu Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (Darwin) iQEcBAEBAgAGBQJT9PsNAAoJEDXWlwnsgJ4ErMIIAIwA74K/jg8F5UxakR2hER/a aC24RroB3TJoHGZrskatgaOUgmZZGZiiX44pYEUOggayxY9VBRRWzNHIEcDanlsd wWweLNIZMuv6T6Fxk7rf7rC2NQA/aRdVBCtcp/xSOPgkL3ahmo4jfQk6bRFGvxxQ Pbe85x8VOxN7YDm/C9H8WLYBFMZpa8l76302pw7OX2lqRxxAPmgxzpCTwPzY3UTS xl9lHoWESCWT0CAj4lslDE2Zqgb2+Ot4zQF00dJDG3GAFLL97m+NYggOqmRbf80m 2MrjCHogXFTJFc+Ugn/Ao2cOZxP96PHsfYNSXiJwS15uI3PMS7Y1oDYKMYqiRcw= =lyYz -----END PGP SIGNATURE----- --1vP3RQMNbRmQcqpvKXDiLgWhDuUU8Seeu--