Date: Wed, 28 Jan 2015 02:37:10 -0600 From: Andrew Gould <andrewlylegould@gmail.com> To: Matthew Seaman <m.seaman@infracaninophile.co.uk> Cc: "Brian W." <brian@brianwhalen.net>, FreeBSD Mailing List <freebsd-questions@freebsd.org> Subject: Re: freebsd-update questions Message-ID: <CAFKhKgo1HTgeSdCCyKsn%2Bn4FjFsPtFdRxwf_t84vFVGWzDDkDg@mail.gmail.com> In-Reply-To: <54C898D9.6000900@infracaninophile.co.uk> References: <CAFKhKgqaHbzWRpxBginmH91s2YVgtzZZsAdHX2T_5OjdnQ1Qag@mail.gmail.com> <54B37A5F.5050302@infracaninophile.co.uk> <CAFKhKgpEsKLBRh8zqPyTJOCPbeM7wJrpPHKOSL2Bw7mBqTR4%2BQ@mail.gmail.com> <CADV=szU%2B2-yhe5skeDHtPNUrxzNKcJsMW=GjMLCha5xBJYnUiA@mail.gmail.com> <CAFKhKgoR5wv2Fvv6P6NKCNBjVUQwQ304iQ%2BR3gSj2qCW4FYgzg@mail.gmail.com> <54C88CA8.7010808@infracaninophile.co.uk> <CAFKhKgpzKnBFiLhngQhHyPecxCUqmhbMmaR0PpiN=SFq55dWtw@mail.gmail.com> <54C898D9.6000900@infracaninophile.co.uk>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFKhKgo1HTgeSdCCyKsn%2Bn4FjFsPtFdRxwf_t84vFVGWzDDkDg>