From owner-freebsd-questions@FreeBSD.ORG Mon Jan 12 18:27:16 2015 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CD9FEDC2 for ; Mon, 12 Jan 2015 18:27:16 +0000 (UTC) Received: from mail-lb0-x230.google.com (mail-lb0-x230.google.com [IPv6:2a00:1450:4010:c04::230]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D0423C7 for ; Mon, 12 Jan 2015 18:27:16 +0000 (UTC) Received: by mail-lb0-f176.google.com with SMTP id p9so19130879lbv.7 for ; Mon, 12 Jan 2015 10:27:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=PT9TsnqorU8yM2pu7P84P41SKY5WYe/tPvkuq4PrBgg=; b=whFn+mwQr2LM36+b4pkF/+gTfsMwtQMD0j24xDsPuM+sUAYv8+j/hNAY9Zzv24uEDM 7XHcVlQBqzLDQxn5WKExuq3pNDbgbds6jzXGPldRoRnWfMZ7uhI8DkktYlVSsB9L9eUV TH+NwsOP2/sbBv16eQWsul2vQEDdGggYXiO9zNgX7JxcYxgwqjrq35BLr4FwI37nNsdw 2MUdARROo90KzZKtPLMbHjLqt7E2B5naqzaqgHFTQGaWGs3Tyx2DvoSuZvM8w/hEhLSg RItQIaDgq9EY9HFsGgxC1eX+sd8Zuh1gnK1Bnjz7cykUV3CaVhlZjoMq4Yre3auXRdbd BDFw== MIME-Version: 1.0 X-Received: by 10.112.55.199 with SMTP id u7mr11968317lbp.74.1421087234032; Mon, 12 Jan 2015 10:27:14 -0800 (PST) Received: by 10.25.161.1 with HTTP; Mon, 12 Jan 2015 10:27:13 -0800 (PST) In-Reply-To: <54B37A5F.5050302@infracaninophile.co.uk> References: <54B37A5F.5050302@infracaninophile.co.uk> Date: Mon, 12 Jan 2015 12:27:13 -0600 Message-ID: Subject: Re: freebsd-update questions From: Andrew Gould To: Matthew Seaman Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1 Cc: FreeBSD Mailing List X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jan 2015 18:27:16 -0000 On Mon, Jan 12, 2015 at 1:40 AM, Matthew Seaman < m.seaman@infracaninophile.co.uk> wrote: > On 12/01/2015 04:08, Andrew Gould wrote: > > I ran 'freebsd-update fetch', but forgot to run 'freebsd-update install'. > > Later, I decided to upgrade, to 10.1, so I ran 'freebsd-update -r > > 10.1-RELEASE upgrade'. So now I have fetched an update and an upgrade. > > What will happen if I run 'freebsd-update install'? > > > > Is there a way to delete what has been fetched and start over? > > Yeah. 'freebsd-update fetch' or 'freebsd-update -r X.Y-RELEASE upgrade' > prepare a set of patches to install in order to effect an update. If > you run one of them but then subsequently omit the 'freebsd-update > install' step, then run either of those commands again, if the target > version has changed in the mean time (flipping between 'fetch' and > 'upgrade' counts), it will download a new set of patches to update the > installed system to the new desired version. This will take advantage > of any patches already downloaded and sitting in freebsd-update's cache, > but otherwise it recreates the update job from scratch. It will ignore > any patches not relevant to the update you requested. > > So the way you start over is to rerun your 'fetch' or 'upgrade' command, > but only if there are new patches to download. > > Cheers, > > Matthew > > -- > Dr Matthew J Seaman MA, D.Phil. > > PGP: http://www.infracaninophile.co.uk/pgpkey > JID: matthew@infracaninophile.co. Does anyone have a link to documentation that shows how to deal with merging configuration files in upgrading via freebsd-update? The online manual mentions the topic but doesn't provide much guidance. Thanks, Andrew