From owner-freebsd-current@FreeBSD.ORG Fri Jun 11 12:25: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 43B7C1065709 for ; Fri, 11 Jun 2010 12:25: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 140308FC0A for ; Fri, 11 Jun 2010 12:25: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 BAD9E46C2B; Fri, 11 Jun 2010 08:25:07 -0400 (EDT) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id C004A8A04E; Fri, 11 Jun 2010 08:25:06 -0400 (EDT) From: John Baldwin To: freebsd-current@freebsd.org Date: Fri, 11 Jun 2010 08:15:51 -0400 User-Agent: KMail/1.12.1 (FreeBSD/7.3-CBSD-20100217; KDE/4.3.1; amd64; ; ) References: <201006101346.59824.jhb@freebsd.org> <4C113342.7070804@icyb.net.ua> <4C114B8C.70407@intertainservices.com> In-Reply-To: <4C114B8C.70407@intertainservices.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201006110815.51061.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Fri, 11 Jun 2010 08:25:06 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.5 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 Cc: Mike Jakubik 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, 11 Jun 2010 12:25:08 -0000 On Thursday 10 June 2010 4:31:08 pm Mike Jakubik wrote: > On 6/10/2010 2:47 PM, Andriy Gapon wrote: > > on 10/06/2010 21:29 Eitan Adler said the following: > > > >> -1 unless mergemaster is replaced. > > Have you tried etcupdate? > > etcupdate and mergemaster have a similar function but do things in quite a > > different way. While one is intended to be more interactive, the other is more > > automated. They can not replace each other. > > > > > > -1 Also. > > How does this differ from a "mergemaster -iFU" ? That's pretty much as > automated as it can get. If you have a locally modified file, (e.g. enabled pam_ssh in /etc/pam.d/system), then mergemaster will require you to manually merge the changes interactively. etcupdate will attempt to do an updated three-way merge similar to doing a 'cvs update' or 'svn update' and will only generate a conflict requiring manual resolution if the merge generates a conflict. Also, mergemaster -iFU will always prompt the user for input if it encounters a conflict which is not always optimal (imagine scripting an OS upgrade for 100's of machines). etcupdate does not do any prompting until you run 'etcupdate resolve' to resolve conflicts. -- John Baldwin