Date: Wed, 28 Jan 2015 08:07:53 +0000 From: Matthew Seaman <m.seaman@infracaninophile.co.uk> To: Andrew Gould <andrewlylegould@gmail.com> Cc: "Brian W." <brian@brianwhalen.net>, FreeBSD Mailing List <freebsd-questions@freebsd.org> Subject: Re: freebsd-update questions Message-ID: <54C898D9.6000900@infracaninophile.co.uk> In-Reply-To: <CAFKhKgpzKnBFiLhngQhHyPecxCUqmhbMmaR0PpiN=SFq55dWtw@mail.gmail.com> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --v3spcCqVfrk51rpfjHlc9gep5CsuVFdJb Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 28/01/2015 07:44, Andrew Gould wrote: > I am being asked to manually merge master.passwd and passwd. Rather th= an > 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= =2E 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 --=20 Dr Matthew J Seaman MA, D.Phil. PGP: http://www.infracaninophile.co.uk/pgpkey JID: matthew@infracaninophile.co.uk --v3spcCqVfrk51rpfjHlc9gep5CsuVFdJb Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.20 (Darwin) iQJ8BAEBCgBmBQJUyJjhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NTNBNjhCOTEzQTRFNkNGM0UxRTEzMjZC QjIzQUY1MThFMUE0MDEzAAoJELsjr1GOGkATJuIP/3t5t39I9i8DCow3RVhnC3mA gaL7jvu+5BczSzHD/E8ilSvvVgaqUvORczir04IIuL10RbnCOjUy7NsZw0UfXzUW rK0qs4YeaOsB9MxrJUPeOUp2lRruEGMVbB56k7injNdIsOz+Kb/zY6Ut3p9FFniy VxF/8ykQfbmB4gS3rjo9QU03kpzERKuPYCc+Y5sEoyQscMvPfuZnicB0fqz/q44J 4BFKRMlAs1lnleaXXTQOyDxoKQOyhCy9hpZm+osDek0nU0gojerl/Li32v7Y+ktY WKs+KSMwqvUHTrHjgqLad2BvPxzJTYMRkjH2fNp4+e7cGepF7GUoICzhmmAS9xfb MsWdXmsanjb/AIcWo5jOD0fG1QiBhI97DFUVbaNtig7MGTAxRVdfE9fqIzAI4Mxn oSVZKtL1r529OIBLIZfEpHTuQxJxVQtpHdaclAVVt6tOOhRv7VHeSd/XLlWRdKj/ wgcZxSDc9LTGMBHMzjRVz/1q90+dugmuZL3W8/dZ9xbg0F6JlEI+pbqpe1rULh3d HU+0udQfz0Huswap9oYRHJp0qRVntAQxwlXC5jaKmLGwv8RcRxfYKGo2ERx5vrQ/ m2thVeWHXtBL4I4eJtKlSEfr/qbAMjFMDYCg3kC4KkmxQFOIwAsUBq2r7ITXjSvU PODUFTiuzVsjNlNFwlg0 =afaf -----END PGP SIGNATURE----- --v3spcCqVfrk51rpfjHlc9gep5CsuVFdJb--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?54C898D9.6000900>