Date: Sun, 7 Jun 2020 11:17:08 +0100 From: Matthew Seaman <matthew@FreeBSD.org> To: freebsd-pkgbase@freebsd.org Subject: Not getting expected 3-way merge Message-ID: <8438088e-2d06-0511-c725-a4a497a9a1f0@FreeBSD.org>
next in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --0mOqgoz48rb5bd9UjZHr6BNdbTQqNobXc Content-Type: multipart/mixed; boundary="WDSiGIua2MhvB9ezqH9LA0V8HTeYj7tFj" --WDSiGIua2MhvB9ezqH9LA0V8HTeYj7tFj Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: quoted-printable I just had a somewhat amusing time updating my CURRENT pkgbase VM. pkg(8) managed to blow away my /etc/master.passwd and /etc/group, replacing them with default versions. I believe this was triggered by the introduction of the new 'test' user and group upstream. Luckily I noticed pretty quickly and could manually merge with the copies from /var/backup, before I did anything like trying to reboot. That would have got me locked out of the system. Now, `pkg info -R FreeBSD-runtime-13.0.s20200607031954` lists both of those files under the `config` section -- so presumably, pkg(8) should do a 3-way merge? Is there something I'm missing here? This seems too obvious a bug not to have been squashed already. I also find that /etc/mail/aliases keeps getting overwritten -- but that file is not listed in the `config` section in the FreeBSD-runtime manifest, which I think it probably should be. Cheers, Matthew --WDSiGIua2MhvB9ezqH9LA0V8HTeYj7tFj-- --0mOqgoz48rb5bd9UjZHr6BNdbTQqNobXc Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEGfFU7L8RLlBUTj8wAFE/EOCp5OcFAl7cvqRfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE5 RjE1NEVDQkYxMTJFNTA1NDRFM0YzMDAwNTEzRjEwRTBBOUU0RTcACgkQAFE/EOCp 5OceeQ//c4fn6Ga+oi41fFfa56881n/ibhszKHhmlEyJhxnVqQWo7DGhdGEzjQTG /aisLHPM3utWEGH9HPacYe7jzZoirtT6+yDtbryEFv737WawrTDXSKINqmaBLaad v84Tr8bGZrbTSC+D8CeRBeSW2MmD7pnriSdUIA68+th8GfFtQlHLmks8nK0Czd3s EeGj/5UcpQlzlKsFKxg0nAt9OGXD3JFCPdvcz7m++lL7g71O8h1J+8GglhRjKe0D MHAT8yEzVQPYiUgEuU4UbOEyVmF4l+m8TJCpx0i3YWL+fDe1nD88c967FiHxPTRX HqkqIm1vlShi71DujC1HoZ1hHN3Vf0x6CkCu/DRuxUXVzG3piyWIfwHtHvfln4W5 J+4Y+bVoOzRDitEbZEcxX+Shvxe8yVCqR9W0qHU3kYq5pn1pwWpTv64zPWEc8Io6 3ojQiJNDrjI2ZzE7XmUW5yRN6ARc71TxTgkjaCbgnL1gwKQCHe9gwyY8Ydfd/6j0 TCS+0CkBErjbGQQQHAQq5uJc7jl8SjrP/170BKPzbCEIKxJ/HD4NYsZ8N/QM6ySb 7xr+lVV1pBIJ7w1m+U0wZKsRWfP2tEPVZ9CvrUnsS0QVfzqMTu12LoIPsRTMvUak 0S6yFCvk6EC034I5kLG6DDdXEmczChBq/r5bXIWoqvooksb7NyY= =MtvM -----END PGP SIGNATURE----- --0mOqgoz48rb5bd9UjZHr6BNdbTQqNobXc--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?8438088e-2d06-0511-c725-a4a497a9a1f0>