From owner-freebsd-stable@FreeBSD.ORG Tue Dec 28 10:15:15 2010 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9AD7D1065694 for ; Tue, 28 Dec 2010 10:15:15 +0000 (UTC) (envelope-from ml@my.gd) Received: from mail-wy0-f182.google.com (mail-wy0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id 2641F8FC19 for ; Tue, 28 Dec 2010 10:15:15 +0000 (UTC) Received: by wyf19 with SMTP id 19so9059028wyf.13 for ; Tue, 28 Dec 2010 02:15:14 -0800 (PST) Received: by 10.227.157.207 with SMTP id c15mr7895206wbx.32.1293531314323; Tue, 28 Dec 2010 02:15:14 -0800 (PST) Received: from dfleuriot.local ([83.167.62.196]) by mx.google.com with ESMTPS id m13sm9144893wbz.15.2010.12.28.02.15.13 (version=SSLv3 cipher=RC4-MD5); Tue, 28 Dec 2010 02:15:13 -0800 (PST) Message-ID: <4D19B8B1.1060404@my.gd> Date: Tue, 28 Dec 2010 11:15:13 +0100 From: Damien Fleuriot User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.13) Gecko/20101207 Thunderbird/3.1.7 MIME-Version: 1.0 To: freebsd-stable@freebsd.org References: <20101227224426.GA11955@lava.net> <20101227224752.GC1505@eggman.experts-exchange.com> <20101227225828.GB11955@lava.net> <4D1931FA.3070403@my.gd> <4D1934B3.8080102@FreeBSD.org> <20101228062028.GA95888@eggman.experts-exchange.com> In-Reply-To: <20101228062028.GA95888@eggman.experts-exchange.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: Accidentally aborted upgrade via freebsd-update - how to recover? X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Dec 2010 10:15:15 -0000 On 12/28/10 7:20 AM, Jason Helfman wrote: > On Mon, Dec 27, 2010 at 04:52:03PM -0800, Doug Barton thus spake: >> On 12/27/2010 16:40, Damien Fleuriot wrote: >>> >>> >>> On 12/27/10 11:58 PM, Clifton Royston wrote: >>>> >>>> OK, and oh well... I wish there were some way to automate the >>>> diffing >>>> out of the $FreeBSD lines. I suppose those might be the artifact of >>>> some previous upgrade, so that the file version present is not the one >>>> expected for FreeBSD 6.1. >>>> >>>> -- Clifton >>>> >>> >>> >>> Wait, do you mean like, mergemaster -F ? >>> >>> Excerpt from the manual: >>> -F If the files differ only by VCS Id ($FreeBSD) install >>> the new file. >>> >>> >>> I've discovered this rather recently, it's a *lifesaver* >>> >>> This comes from fbsd7's version though, I can not say for the one you're >>> still running on fbsd6 >> >> You always want to run mergemaster from the version you are upgrading >> _to_. It doesn't happen often (by design) but occasionally mergemaster >> has to grow "special knowledge" of specific files/directories/etc. in a >> new FreeBSD version. > > As far as I can tell, freebsd-update doesn't use mergemaster. > > /usr/src/usr.sbin/freebsd-update/freebsd-update.sh > > Source installation does, however I don't believe a binary upgrade does. > Wouldn't it be possible for him to invoke mergemaster manually though, so that his configuration changes get merged much easier ? This implies having a current version of mergemaster and the new configuration files to compare though...