From owner-freebsd-questions@FreeBSD.ORG Wed Jan 28 08:37:13 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 013641A5 for ; Wed, 28 Jan 2015 08:37:12 +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 6FB8FE93 for ; Wed, 28 Jan 2015 08:37:12 +0000 (UTC) Received: by mail-lb0-f176.google.com with SMTP id z12so17350284lbi.7 for ; Wed, 28 Jan 2015 00:37:10 -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=CelWCOa/HJA4mOVeT69xeGOfhh9z/xNuZSjbX0bmMsM=; b=WuGH5l3VF061JOm+6AfgPo/t8SYEKWrAKm6tgcFFtSaBa420/layBBCdF89uhybMsE gnGUyfYzA2uUTTKViEjVoBrxX/T6zdvrhACrA/wPm17g4OOpIQy+G2+3jXN0obEophAF JWMUCut1IsC7qf1dSYMPH8iBRjopszkwZOyBc7KBL51r7gnlhXKLnLzcapECd5B4gCnk RhF/VJld+SLr/42uk0SyOYOjz4lnHTwhMY3jNLe+MvR+HeZZmjw3ctd08BSZTKwczRjr n5F+/zM33vwKXbtfKNxgx3EHhuWFaGU5NLHsxth3g+B4qa+mMXnqg9ZVEQcOZ4j4jwdQ kbRw== MIME-Version: 1.0 X-Received: by 10.112.129.195 with SMTP id ny3mr6617983lbb.10.1422434230300; Wed, 28 Jan 2015 00:37:10 -0800 (PST) Received: by 10.25.161.1 with HTTP; Wed, 28 Jan 2015 00:37:10 -0800 (PST) In-Reply-To: <54C898D9.6000900@infracaninophile.co.uk> References: <54B37A5F.5050302@infracaninophile.co.uk> <54C88CA8.7010808@infracaninophile.co.uk> <54C898D9.6000900@infracaninophile.co.uk> Date: Wed, 28 Jan 2015 02:37:10 -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 08:37:13 -0000 On Wed, Jan 28, 2015 at 2:07 AM, Matthew Seaman < m.seaman@infracaninophile.co.uk> wrote: > On 28/01/2015 07:44, Andrew Gould wrote: > > 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/? > > What you are editing is a copy of the master.passwd file held in > freebsd-update's work area, which it will only move into place once you > run 'freebsd-update install' So fluffing the merge edit is not going to > immediately screw up your system. It should be possible to overwrite > the copy of master.passwd in freebsd-update's prep area -- no idea if > that works, but I can't see any reason why not. However it's not a > usual thing to do, and you'ld be better advised to not screw up the > merge edits. > > One thing that may help you: by default freebsd-update uses vi as the > default editor for these merge conflict resolutions. You can substitute > whatever editor you prefer simply by setting the EDITOR environment > variable before you start. Many editors will recognise you're dealing > with a merge conflict and put you into a special mode to make that easier. > > I don't know why it's asking you about /etc/passwd as that's a file > derived directly from master.passwd -- don't worry too much about it, > and just run 'pwd_mkdb -p' before you reboot. > > Cheers, > > Matthew > > -- > Dr Matthew J Seaman MA, D.Phil. > > PGP: http://www.infracaninophile.co.uk/pgpkey > JID: matthew@infracaninophile.co.uk > > Thank you for your help. Andrew