From owner-freebsd-current@freebsd.org Sat Aug 11 10:15:13 2018 Return-Path: Delivered-To: freebsd-current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B06281065937 for ; Sat, 11 Aug 2018 10:15:13 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [198.144.209.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E0D5C74A33; Sat, 11 Aug 2018 10:15:12 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.15.2/8.15.2) with ESMTP id w7BAF9Sx073099; Sat, 11 Aug 2018 10:15:09 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.15.2/8.15.2/Submit) id w7BAF9XC073094; Sat, 11 Aug 2018 03:15:09 -0700 (PDT) (envelope-from david) Date: Sat, 11 Aug 2018 03:15:08 -0700 From: David Wolfskill To: Graham Perrin Cc: freebsd-current@freebsd.org, Kurt Jaeger Subject: Re: Unexpected results with 'mergemaster -Ui' Message-ID: <20180811101508.GA1152@albert.catwhisker.org> Mail-Followup-To: David Wolfskill , Graham Perrin , freebsd-current@freebsd.org, Kurt Jaeger References: <0d409d71-5200-b475-34fc-16fa72861b13@gmail.com> <20180811084833.GK2118@home.opsec.eu> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="V/w9OosCZA9rINHP" Content-Disposition: inline In-Reply-To: <20180811084833.GK2118@home.opsec.eu> User-Agent: Mutt/1.10.1 (2018-07-13) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Aug 2018 10:15:13 -0000 --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 > > 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--