From owner-freebsd-questions@FreeBSD.ORG Mon Jan 12 18:46:49 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 4FB30BAF for ; Mon, 12 Jan 2015 18:46:49 +0000 (UTC) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com [209.85.215.53]) (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 B9AC78F3 for ; Mon, 12 Jan 2015 18:46:48 +0000 (UTC) Received: by mail-la0-f53.google.com with SMTP id gm9so26078582lab.12 for ; Mon, 12 Jan 2015 10:46:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=oNugAM5/j2DdRfL7p59okgje+W9u0PzOiCD/GZhxJUA=; b=c/4RFWSmQFpdaOt0r2OIxCJSqvBGFGalkHhxOocByQvFpW3bWeYtwfWgeG9d67Rz10 Vtdi40k0aHMyi0Fl2jt+xtSS6JZwQjDVmApbX5vu3BDRleeGeHtjnU9BMeUeU6Kd0n+U kV1S4xrcnWDUFR0aCHQ0bmQfTE38lAGHPdVtX+AZ9KZxdZcptWVjDjWZOaj2gUhpGy6w pVeF0g3IoTnJwVO72hkFT/SNWqqculdfZm/1xLwUGuFuAq9RuQn0GQIeWTCL1str0bI0 JKIebP3WqMOvLNKNdWgoMP0Otb+Bn63OFL+TXu3+xOci0KD+8HEAb0TxAtTnr2vg4zk5 G0aA== X-Gm-Message-State: ALoCoQlB0+G/YWlofonJKD+izNyN7SR++9Mpd+qVsOxPB6X32RRiS6JKP3ZdUx/X4C1bOhyGZp/E MIME-Version: 1.0 X-Received: by 10.153.4.2 with SMTP id ca2mr7852108lad.40.1421088406200; Mon, 12 Jan 2015 10:46:46 -0800 (PST) Received: by 10.152.122.227 with HTTP; Mon, 12 Jan 2015 10:46:46 -0800 (PST) X-Originating-IP: [76.252.236.89] Received: by 10.152.122.227 with HTTP; Mon, 12 Jan 2015 10:46:46 -0800 (PST) In-Reply-To: References: <54B37A5F.5050302@infracaninophile.co.uk> Date: Mon, 12 Jan 2015 10:46:46 -0800 Message-ID: Subject: Re: freebsd-update questions From: "Brian W." To: Andrew Gould 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:46:49 -0000 A key thing to watch for in the conf files is that markers will be put in place so you can see what's new; those need to be deleted. On Jan 12, 2015 10:27 AM, "Andrew Gould" wrote: > 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 > _______________________________________________ > freebsd-questions@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-questions > To unsubscribe, send any mail to " > freebsd-questions-unsubscribe@freebsd.org" >