svn commit: r270177 - in stable/8: tools/regression/usr.sbin/etcupdate usr.sbin usr.sbin/etcupdate

Peter Wemm peter at
Wed Aug 20 19:46:22 UTC 2014

On 8/19/14 10:54 AM, John Baldwin wrote:
> Author: jhb
> Date: Tue Aug 19 17:54:15 2014
> New Revision: 270177
> URL:
> Log:
>   MFC 238423,238426,238428,258063,258064,258066,258097,258185,259134:
>   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.
>   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.
 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!

Peter Wemm - peter at; peter at; peter at; KI6FJV

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 487 bytes
Desc: OpenPGP digital signature
URL: <>

More information about the svn-src-stable-8 mailing list