RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?

Ok, this is strange.

I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable as
of today, using csup and building world.

As part of that process I did (as I always do) 'mergemaster -iU' after
the 'make installworld' step.
A few files on my machines are modified by me, and thus should nevber
be upgraded:
/etc/dhclient.conf
/etc/motd (mergemeaster will usually ask about this - this time it did
not, it claimed it wasn't user modified, huh?)
/etc/profile
/root/.profile
/etc/passwd (mergemaster sked about it, I pressed 'd', but it was still
upgraded, ugh!)
/etc/group (mergemaster sked about it, I pressed 'd', but it was still
upgraded, ugh!)

It can be more files, I haven't found out yet.

Has anyone else seen this?

I am upgrading my next machine, this time I'll have backups and keep
better notes.
--
Regards,
Torfinn Ingolfsen

_______________________________________________
freebsd-stable@xxxxxxxxxxx mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-stable
To unsubscribe, send any mail to "freebsd-stable-unsubscribe@xxxxxxxxxxx"

Relevant Pages

  • Re: SMP and networking under FreeBSD 5.3
    ... If so, it does show that natd is running, ... bit I don't like is mergemaster, just because it's fiddly and hands on ... The handbook has a great section on upgrading. ... just summarise the relevant bits of config and the natd error you are ...
    (freebsd-questions)
  • Re: mergemaster feature suggestion...
    ... >> mergemaster always asks if you want to install a file which doesnt ... The most relevant document regarding upgrading in this context ... This person simply requested a feature for mergemaster. ...
    (freebsd-current)
  • About mergemaster (Re: upgrading)
    ... I had a lot of different words to say into the air while upgrading:) ... Most painful procedure for me is running mergemaster. ... Nick Barnes wrote: ... >>buildworld, make buildkernel KERNCONF=MILOWARE, then make ...
    (freebsd-stable)
  • Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
    ... As part of that process I did 'mergemaster -iU' after ... upgraded, ugh!) ... I am upgrading my next machine, this time I'll have backups and keep ... Not that its a cure but are master.passwd and group backups in ...
    (freebsd-stable)
  • Re: Issue upgrading to 7.4, looking for guidance
    ... My eventual solution was here, if you don't want to read through the ... After this a bunch of removing, reinstalling, and upgrading of ports was ... not having a FreeBSD CD for any version of FreeBSD would make ...
    (freebsd-questions)