From owner-freebsd-stable@FreeBSD.ORG Wed Nov 5 19:29:44 2014 Return-Path: Delivered-To: freebsd-stable@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 776174CA for ; Wed, 5 Nov 2014 19:29:44 +0000 (UTC) Received: from gromit.dlib.vt.edu (gromit.dlib.vt.edu [128.173.126.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "gromit.dlib.vt.edu", Issuer "Chumby Certificate Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 45841BCE for ; Wed, 5 Nov 2014 19:29:44 +0000 (UTC) Received: from [172.31.120.59] (npc6520ffc.cns.vt.edu [198.82.15.252]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by gromit.dlib.vt.edu (Postfix) with ESMTPSA id 288D4AC2; Wed, 5 Nov 2014 14:29:37 -0500 (EST) References: <545A348A.4000908@pean.org> Mime-Version: 1.0 (1.0) In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Message-Id: <2B820BFF-8565-4A4D-B05E-3A66E8939A52@gromit.dlib.vt.edu> X-Mailer: iPad Mail (11D257) From: Paul Mather Subject: Re: freebsd-udapte upgrade. Date: Wed, 5 Nov 2014 14:29:36 -0500 To: =?utf-8?Q?Peter_Ankerst=C3=A5l?= Cc: Scot Hetzel , FreeBSD Stable X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Nov 2014 19:29:44 -0000 > On Nov 5, 2014, at 1:58 PM, Peter Ankerst=C3=A5l wrote: >=20 >=20 >=20 >>> On 5 nov 2014, at 19:53, Scot Hetzel wrote: >>>=20 >>> On Wed, Nov 5, 2014 at 8:30 AM, Peter Ankerst=C3=A5l wr= ote: >>> Could someone please explain how to use freebsd-update upgrade without >>> destroying all of your configuration files? >>>=20 >>> I really don't understand how to use the merge function.. In this case i= >>> typed :q for all files it asked about. :wq seem to >>> do about the same thing. Notice that a few of the files has this shit in= >>> multiple places. I can't be right that I should edit every file manually= and >>> look for "current version" and so on? >> Most likely what happened is that when you used :wq it wrote the >> contents of the diff between your current version and the new version >> to your existing configuration files. If you had stuck to using :q, >> it should have left your existing configuration files alone. >=20 > This was done with :q only. I dont get it. When you upgrade using freebsd-update, it will try and update configuration f= iles automatically. If there are any configuration files whose differences c= an't be resolved automatically, it will present that file for editing with t= he merge conflicts in the file presented. You are then supposed to resolved= the conflicts manually. I've always resolved any conflicts, so I've not had any experience if you si= mply ":q" from the editor, thereby leaving in all the conflict markers. If f= reebsd-update doesn't check for unresolved conflicts and force you to edit t= he file again, I presume your configuration file will now basically be inval= id. Maybe this is what happened in your case? Cheers, Paul.=