Unexpected results with 'mergemaster -Ui'

David Wolfskill david at catwhisker.org
Sat Aug 11 10:15:13 UTC 2018


On Sat, Aug 11, 2018 at 10:48:33AM +0200, Kurt Jaeger wrote:
> Hi!
> 
> > <https://pastebin.com/m7q8dpWB> line 133 onwards, for example.
> > 
> > I never before found any potential change to
> > /etc/group
> > 
> > Please, is it unusual?
> 
> 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)
-- 
David H. Wolfskill				david at 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.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 618 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-current/attachments/20180811/3f78cc70/attachment.sig>


More information about the freebsd-current mailing list