From owner-freebsd-stable@FreeBSD.ORG Thu Nov 6 13:52:06 2014 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F0A1DE47 for ; Thu, 6 Nov 2014 13:52:05 +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 A454A15C for ; Thu, 6 Nov 2014 13:52:05 +0000 (UTC) Received: from pmather.lib.vt.edu (pmather.lib.vt.edu [128.173.126.193]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by gromit.dlib.vt.edu (Postfix) with ESMTPSA id 5CDCD130; Thu, 6 Nov 2014 08:52:03 -0500 (EST) Content-Type: text/plain; charset=windows-1252 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: freebsd-udapte upgrade. From: Paul Mather In-Reply-To: <2DE7E247-63F1-4A3E-AE25-46E1207BB0A8@pean.org> Date: Thu, 6 Nov 2014 08:52:02 -0500 Content-Transfer-Encoding: quoted-printable Message-Id: References: <545A348A.4000908@pean.org> <2B820BFF-8565-4A4D-B05E-3A66E8939A52@gromit.dlib.vt.edu> <2DE7E247-63F1-4A3E-AE25-46E1207BB0A8@pean.org> To: =?windows-1252?Q?Peter_Ankerst=E5l?= X-Mailer: Apple Mail (2.1878.6) 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: Thu, 06 Nov 2014 13:52:06 -0000 On Nov 5, 2014, at 5:40 PM, Peter Ankerst=E5l wrote: >=20 >> On 05 Nov 2014, at 20:29, Paul Mather = wrote: >>=20 >>=20 >>> On Nov 5, 2014, at 1:58 PM, Peter Ankerst=E5l = 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=E5l = wrote: >>>>> 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. >>=20 >> When you upgrade using freebsd-update, it will try and update = configuration files automatically. If there are any configuration files = whose differences can't be resolved automatically, it will present that = file for editing with the merge conflicts in the file presented. You = are then supposed to resolved the conflicts manually. >>=20 >> I've always resolved any conflicts, so I've not had any experience if = you simply ":q" from the editor, thereby leaving in all the conflict = markers. If freebsd-update doesn't check for unresolved conflicts and = force you to edit the file again, I presume your configuration file will = now basically be invalid. >>=20 >> Maybe this is what happened in your case? >>=20 >> Cheers, >>=20 >> Paul. >=20 > But its too easy to corrupt your setup completely. This is much worse = than mergemaster. And I haven=92t seen any instructions on this in the = handbook. I agree. I am more used to and more comfortable with source-based = updates, but I have fairly recently started using freebsd-update on = quite a few servers to help out co-admins newer to FreeBSD, who might be = put off by updating from source. I'm more accustomed to mergemaster, and I like its merge options and way = of merging changes to config files. I'm not too familiar with what = freebsd-update allows. It does seem that, by default, it's relatively = easy to pass on a configuration file with conflict markers in it, which = would corrupt your setup, like you say. I don't know whether = freebsd-update can be made to stall on a config file until it is free of = conflict markers, or whether it would allow you to do a = mergemaster-style resolution (i.e., keep old; replace with new; do = manual merge; etc.). I also agree the handbook is fairly light on describing this part of the = process, and those who are unfamiliar with resolving merge conflicts = using conflict markers may be left bewildered as to what to do at this = step. Cheers, Paul.