From owner-freebsd-stable@FreeBSD.ORG Tue Dec 28 06:23:38 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 1E358106564A; Tue, 28 Dec 2010 06:23:38 +0000 (UTC) (envelope-from jhelfman@experts-exchange.com) Received: from mail.experts-exchange.com (mail.experts-exchange.com [72.29.183.251]) by mx1.freebsd.org (Postfix) with ESMTP id E9A628FC19; Tue, 28 Dec 2010 06:23:37 +0000 (UTC) Received: from mail.experts-exchange.com (localhost [127.0.0.1]) by mail.experts-exchange.com (Postfix) with ESMTP id 6D602CA5907; Mon, 27 Dec 2010 22:23:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=e-e.com; h= user-agent:in-reply-to:content-disposition:content-type :content-type:mime-version:references:message-id:subject:subject :from:from:date:date:received:received:received; s=ee; t= 1293517417; x=1295331817; bh=0JCy1AFLzC9cqZYTX2s7AtSEFPW7447NW5U LvsEfv28=; b=G2n3t3f14OIRl41AYWrQwSZWtduXdgUI34HwJzz77n4z596zcu0 UVcdT6Rp1owJSkVoQd0/TLP3buFFdevEaosMeuihaXWpJ/E6xDOjYl5rrCeZyPim /MotrmJ5ywHTZUhYIKM4Qi5oCwoe+YQI3hKlLJZzX8AcHsnVpJlSgqIg= X-Virus-Scanned: amavisd-new at experts-exchange.com Received: from mail.experts-exchange.com ([127.0.0.1]) by mail.experts-exchange.com (mail.experts-exchange.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NEd8ikkxiR5Q; Mon, 27 Dec 2010 22:23:37 -0800 (PST) Received: from experts-exchange.com (unknown [192.168.103.122]) by mail.experts-exchange.com (Postfix) with SMTP id 21252CA58E9; Mon, 27 Dec 2010 22:23:37 -0800 (PST) Received: (nullmailer pid 95917 invoked by uid 1001); Tue, 28 Dec 2010 06:20:28 -0000 Date: Mon, 27 Dec 2010 22:20:28 -0800 From: Jason Helfman To: Doug Barton Message-ID: <20101228062028.GA95888@eggman.experts-exchange.com> References: <20101227224426.GA11955@lava.net> <20101227224752.GC1505@eggman.experts-exchange.com> <20101227225828.GB11955@lava.net> <4D1931FA.3070403@my.gd> <4D1934B3.8080102@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <4D1934B3.8080102@FreeBSD.org> X-Operating-System: FreeBSD 8.1-RELEASE X-Living-The-Dream: I love the SLO Life! User-Agent: Mutt/1.5.21 (2010-09-15) Cc: freebsd-stable@freebsd.org 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 06:23:38 -0000 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. -jgh