From owner-freebsd-stable@FreeBSD.ORG Mon Dec 27 23:06:06 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 EF6F8106564A for ; Mon, 27 Dec 2010 23:06:05 +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 CB3EF8FC0C for ; Mon, 27 Dec 2010 23:06:05 +0000 (UTC) Received: from mail.experts-exchange.com (localhost [127.0.0.1]) by mail.experts-exchange.com (Postfix) with ESMTP id 6CBA1CA5710; Mon, 27 Dec 2010 15:06:05 -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= 1293491165; x=1295305565; bh=36yOZvrI+QysIPRwHbU9p20eU5ERn2P+pBN A+mID7P8=; b=Dt19w3d9GDeUciIwaYBTpd75LVPDciMtBhvFI1dbVXVi/EXJgbe EpRPpxMTwJ2G1GJJLoHmXP75xbisA11w4XjdyoXPIHtR0uVQ50DFc9ShbeuNf1Bf O+zfmVFCBfaamzGx2zMiLDlB4lDkB/rFt9anVZG6F3xMUDBjw6ZENyyI= 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 E5Uu5hFhPY32; Mon, 27 Dec 2010 15:06:05 -0800 (PST) Received: from experts-exchange.com (unknown [192.168.103.122]) by mail.experts-exchange.com (Postfix) with SMTP id 1DA11CA570C; Mon, 27 Dec 2010 15:06:05 -0800 (PST) Received: (nullmailer pid 92420 invoked by uid 1001); Mon, 27 Dec 2010 23:02:56 -0000 Date: Mon, 27 Dec 2010 15:02:56 -0800 From: Jason Helfman To: freebsd-stable@freebsd.org Message-ID: <20101227230255.GD1505@eggman.experts-exchange.com> References: <20101227224426.GA11955@lava.net> <20101227224752.GC1505@eggman.experts-exchange.com> <20101227225828.GB11955@lava.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20101227225828.GB11955@lava.net> 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: cliftonr@lava.net 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: Mon, 27 Dec 2010 23:06:06 -0000 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: > > Thanks for the prompt response! Your welcome :) > >> 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?) >> > >> > I just tried typing "sudo freebsd-update install" and >> >"sudo freebsd-update install -r 7.1-RELEASE" but that gives me: >> >> I've never run this command for a specific release. >> > >> >"No updates are available to install." >> >> What happens if you run "freebsd-update install" ? > > Same message. You may want to just try and run the 'fetch' again. freebsd-update -r 7.1-RELEASE fetch > > >> 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. > > 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. -jgh > > -- 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 > -- Jason Helfman System Administrator experts-exchange.com http://www.experts-exchange.com/M_4830110.html