svn commit: r193635 - head/etc

[Dag-Erling Smørgrav]

Doug Barton <dougb at FreeBSD.org> writes:
> Dag-Erling Smørgrav <des at des.no> writes:
> > 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."

Hmm, I'm not sure I follow, since I'm not familiar with the innards of
mergemaster, but can you tell it's new?  If you can, you can check if
there's already a file of the same name before installing the new one?

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

I didn't realize it was the default - but I really, really like it.  It
makes mergemaster a *lot* easier to use.

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

Doesn't sound unsurmountable.

> Meanwhile I'm sure you were able to restore from backups

Of course (not that there was much to restore - just "server ntp.des.no
iburst maxpoll 6"), and now that I know about it, I can list it in
IGNORE_FILES along with motd and printcap.

DES
-- 
Dag-Erling Smørgrav - des at des.no