From owner-freebsd-stable@FreeBSD.ORG Tue Dec 28 00:10:01 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 C40AA1065679 for ; Tue, 28 Dec 2010 00:10:01 +0000 (UTC) (envelope-from cliftonr@lava.net) Received: from outgoing01.lava.net (outgoing01.lava.net [IPv6:2001:1888:0:1:230:48ff:fe5b:3b50]) by mx1.freebsd.org (Postfix) with ESMTP id 6BA6C8FC1D for ; Tue, 28 Dec 2010 00:10:01 +0000 (UTC) Received: from malasada.lava.net (malasada.lava.net [64.65.64.17]) by outgoing01.lava.net (Postfix) with ESMTP id 8E7B714E62C; Mon, 27 Dec 2010 14:10:00 -1000 (HST) Received: by malasada.lava.net (Postfix, from userid 102) id C108F196E1C; Mon, 27 Dec 2010 14:09:59 -1000 (HST) Date: Mon, 27 Dec 2010 14:09:59 -1000 From: Clifton Royston To: Jason Helfman Message-ID: <20101228000959.GC11955@lava.net> Mail-Followup-To: Jason Helfman , freebsd-stable@freebsd.org References: <20101227224426.GA11955@lava.net> <20101227224752.GC1505@eggman.experts-exchange.com> <20101227225828.GB11955@lava.net> <20101227230255.GD1505@eggman.experts-exchange.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20101227230255.GD1505@eggman.experts-exchange.com> User-Agent: Mutt/1.4.2.3i 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 00:10:01 -0000 On Mon, Dec 27, 2010 at 03:02:56PM -0800, Jason Helfman wrote: > On Mon, Dec 27, 2010 at 12:58:28PM -1000, Clifton Royston thus spake: > >On Mon, Dec 27, 2010 at 02:47:53PM -0800, Jason Helfman wrote: > >>On Mon, Dec 27, 2010 at 12:44:26PM -1000, Clifton Royston thus spake: > >... > >>> How can I continue from here without downloading and applying 29000+ > >>>patches all over again, not to mention having to manually resolve the > >>>updated $FreeBSD lines in a ton of config files? (Or worse, having it > >>>try to apply patches which have already been applied?) ... > >>If you haven't installed anything, there is nothing to rollback. A > >>feature that is part of freebsd-update. > > > > I guess I should have realized that, at least. > > > >>> Is there some way to resume where I left off? > >> > >>I'm not aware of any method to do this, other than to remove everything > >>under /var/db/freebsd-update and start from the beginning. I started over but without removing the directory, and found that after redownloading all the metadata, it DTRT: nothing more got downloaded, and it apparently identified all the automatic merges as already patched. It seems to be starting over at the beginning of the ones to manually patch up. > > 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. > > I believe there is with a handcrafted mergemaster.rc file. I was told by > Colin that this 'bug' was introduced at some point with freebsd-update, > as branches at one point weren't tagged. > > When they started to get tagged, freebsd-update started to compare. Ah, I saw that discussion a while back on one of the lists for mergemaster, but I didn't realize it applied to freebsd-update as well. Next time around, I'll revisit the email thread and figure out which options I want to pull in to skip those lines. -- Clifton -- Clifton Royston -- cliftonr@iandicomputing.com / cliftonr@lava.net President - I and I Computing * http://www.iandicomputing.com/ Custom programming, network design, systems and network consulting services