svn commit: r193635 - head/etc

[Doug Barton]

Dag-Erling Smørgrav wrote:
> Edwin Groothuis <edwin at FreeBSD.org> writes:
>> Author: edwin
>> Date: Sun Jun  7 13:26:57 2009
>> New Revision: 193635
>> URL: http://svn.freebsd.org/changeset/base/193635
>>
>> Log:
>>   Welcome to a default installed /etc/ntp.conf
> 
> Great, now mergemaster blew away my ntp.conf and installed this one
> instead.  Apparently, it thinks AUTO_UPGRADE means it's fine to
> overwrite an existing file with a new one...

Yes, that's exactly what the option means. The problem comes in
because it's a new file, which means that there is no record of it in
the mtree file, so it does not show up as "changed." The problem is
compounded by the fact that this is the first time I can remember that
we've introduced a new file in the base that has the same name as a
commonly (pre-)existing file that most users would have in /etc (as
opposed to having it in /usr/local). Suggestions on how to deal with
this issue are welcome. Please follow up on -current or -hackers.

FWIW, this is one of the reasons that I resisted the idea of using
mtree for this function, and continue to resist the idea of the -U
option being the default. There is no way that I can see to have mtree
list the files that have _not_ changed, which would be the safest way
to implement this option. If someone wants to implement that option
for mtree I will gladly update the -U option in mergemaster. (Looking
at doing the change in mtree myself is "on the list," but it's way
down there ...)

Meanwhile I'm sure you were able to restore from backups, and there is
always mergemaster's -P option ....


Doug

-- 

    This .signature sanitized for your protection