Date: Sat, 11 Aug 2018 03:15:08 -0700 From: David Wolfskill <david@catwhisker.org> To: Graham Perrin <grahamperrin@gmail.com> Cc: freebsd-current@freebsd.org, Kurt Jaeger <pi@freebsd.org> Subject: Re: Unexpected results with 'mergemaster -Ui' Message-ID: <20180811101508.GA1152@albert.catwhisker.org> In-Reply-To: <20180811084833.GK2118@home.opsec.eu> References: <0d409d71-5200-b475-34fc-16fa72861b13@gmail.com> <20180811084833.GK2118@home.opsec.eu>
next in thread | previous in thread | raw e-mail | index | archive | help
--V/w9OosCZA9rINHP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Aug 11, 2018 at 10:48:33AM +0200, Kurt Jaeger wrote: > Hi! >=20 > > <https://pastebin.com/m7q8dpWB>; line 133 onwards, for example. > >=20 > > I never before found any potential change to > > /etc/group > >=20 > > Please, is it unusual? >=20 > No, it is normal, that happens if you have local changes. > I suggest you discard the incoming /etc/group and go with your > current version and the local changes. > .... Caution: if you do that, you will lose the (new) entry for the group "ntpd", which is probably not what you want. There was a recent(-ish) change that created the user & group "ntpd" *so there should be a corresponding change to /etc/master.passwd, as well). I recommend that you "merge" the changes: take the FreeBSD version ("r") for the $FreeBSD: line and for the ntpd line; use yours ("l") for the others, then -- optionally -- "view" the changed file (will use your $PAGER -- from which you can invoke $EDITOR and make additional changes if something doesn't look quite right), then "install" the changed file. Tangentially related, I also recommend doing these updates within a script(1) session, so you have a record in case there are questionis about what actually happened. Peace, david (who updates daily) --=20 David H. Wolfskill david@catwhisker.org Trump is gaslighting us: https://www.bbc.com/news/world-us-canada-44959300 See http://www.catwhisker.org/~david/publickey.gpg for my public key. --V/w9OosCZA9rINHP Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEEzLfO+ReoAfQwZNd7FTnMQKBJ7hcFAltutyxfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEND QjdDRUY5MTdBODAxRjQzMDY0RDc3QjE1MzlDQzQwQTA0OUVFMTcACgkQFTnMQKBJ 7heN0Qf+JMDsdQjUfXf2lBbGuEqn6EuItfEmoiiyCEkqJuJy96paxPQau5Y6/Ztw hT0QV3kZZhyMQ52j7nQuIdmmUPhibkRepISitYoqbLSfdbM8bLUCGHLcPw04iuHn +zKbVFf2Lu4Yemizss8BVOx+Yp+rmIKdo2NMBqZFydA1XgcSnGaLUU5tzgbHlYdN 3Lfj81KcMvHfxOSN6Re9ZaB7qZQ6csF3dBvuQwrB1qB0oFNBoJ95dAqrEDX7UNwy V+viUFF74YfUbKcMD7ijMp4pZN6Zx8fDuvYX5Klm9QWKurG5ROqdQ5sbV7p8XDJ4 awcidSC34RX1nJQNKH0D3E58CnFTNA== =9ybV -----END PGP SIGNATURE----- --V/w9OosCZA9rINHP--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180811101508.GA1152>