From owner-freebsd-questions@FreeBSD.ORG Wed Jan 28 07:44:47 2015 Return-Path: Delivered-To: freebsd-questions@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 9F4116A9 for ; Wed, 28 Jan 2015 07:44:47 +0000 (UTC) Received: from mail-lb0-x22c.google.com (mail-lb0-x22c.google.com [IPv6:2a00:1450:4010:c04::22c]) (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 0B5BE9AE for ; Wed, 28 Jan 2015 07:44:47 +0000 (UTC) Received: by mail-lb0-f172.google.com with SMTP id l4so17254023lbv.3 for ; Tue, 27 Jan 2015 23:44:45 -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=jguXFP4isiPNz4N+47rGdSqdkyf0Awp54nkzLHyofEs=; b=hOCW1yxQ3+qqsCLs1NdDg1B16/odoQ98gMRBLXpcno6BDQH+afK0NtN7DMyFGDlW85 4WulHq1mo2jrADfT9ZRbNVHczzzAPZf0sxUCswuVZ7M/pSDU5TaQvaSbjnXIidPm9oUN 6qqEgvjlY82pcnKagKUuuA0NRFTj7bqM3mXKkOVcNWzgNLcWYKmhof/EJjwVWQQtBtVo cuN3OkvlQ1mr8Uu5iUftl3jaOFvZq+qD2B99u+U29DyVxBlP++yXXmCg3CAt6+grqbzR aNQRx1s3h43CjHDPGDF30dy9g8kfEV/SyRSeO1X2j/iyanGRpi0nvChyHipG/jah8sH+ RT+g== MIME-Version: 1.0 X-Received: by 10.152.203.230 with SMTP id kt6mr6158615lac.38.1422431084903; Tue, 27 Jan 2015 23:44:44 -0800 (PST) Received: by 10.25.161.1 with HTTP; Tue, 27 Jan 2015 23:44:44 -0800 (PST) In-Reply-To: <54C88CA8.7010808@infracaninophile.co.uk> References: <54B37A5F.5050302@infracaninophile.co.uk> <54C88CA8.7010808@infracaninophile.co.uk> Date: Wed, 28 Jan 2015 01:44:44 -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: "Brian W." , 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: Wed, 28 Jan 2015 07:44:47 -0000 On Wed, Jan 28, 2015 at 1:15 AM, Matthew Seaman < m.seaman@infracaninophile.co.uk> wrote: > On 2015/01/28 02:50, Andrew Gould wrote: > > On Mon, Jan 12, 2015 at 12:46 PM, Brian W. > wrote: > > > >> 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. > >> > > When I attempted an upgrade to 10.1-RELEASE, I got a message that certain > > configuration files couldn't be merged and that I should hit the enter > > button to merge them manually in vi. > > > > In vi, the first line was a series of left pointing arrows and a > reference > > to version 10.0. That was followed by the content of the new > > configuration file. (I think it was new because the lines I added to the > > existing files weren't there.) > > > > The last line was a series of right pointing errors and a reference to > > version 10.1. > > > > What am I supposed to do to keep the old configuration file contents? > > There are no instructions. > > This is freebsd-update asking you to resolve conflicts in a three-way > merge between the file as supplied with the old version of FreeBSD, the > equivalent in the new version, and the file that is actually present on > your system. The >>>>>>>>, ========= and <<<<<<<< markers are a > standard convention for indicating where there were areas of the file > that were changed differently between old --> new and old --> what's on > your system: what is generally called a 'merge conflict.' > > Edit the file so it has the contents you want. The sections indicated > by >>>>>>> etc markers are usually smaller than the whole file. It's > important to remove all the markers in those files, or various things > may not start up correctly when you reboot. > > Cheers, > > Matthew > > > I am being asked to manually merge master.passwd and passwd. Rather than risk making a mistake on the passwords, can I copy the files from /etc/ to /var/db/freebsd-update/merge/new/etc/? Thanks, Andrew