Re: Unexpected results with 'mergemaster -Ui'

[Graham Perrin]

On 11/08/2018 09:02, Graham Perrin wrote:
> … Also today, with an earlier run of mergemaster, when I _did_ choose to 
> install a temporary file, the installation failed. I didn't keep a note of 
> the specifics but a file mode was mentioned.

For reference only

I built a slightly more recent world and kernel,
installed the kernel,
could not reproduce the installation failure with mergemaster.

(Side note: could not installworld, bugged as outlined at 
. I guess 
that the breakage will be fixed in due course.)

___
freebsd-current@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"

Re: Unexpected results with 'mergemaster -Ui'

[David Wolfskill]

Of course, I then saw that you *had* an "ntpd" entry in your side
anyway.  Sorry for the noise.

Peace,
david
-- 
David H. Wolfskill  da...@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.


signature.asc
Description: PGP signature

Re: Unexpected results with 'mergemaster -Ui'

[David Wolfskill]

On Sat, Aug 11, 2018 at 10:48:33AM +0200, Kurt Jaeger wrote:
> Hi!
> 
> >  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  da...@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.


signature.asc
Description: PGP signature

Re: Unexpected results with 'mergemaster -Ui'

[Kurt Jaeger]

Hi!

>  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.

-- 
p...@freebsd.org +49 171 3101372  2 years to go !
___
freebsd-current@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"