On Thu, Jun 18, 2009 at 09:58:01PM -0700, Doug Barton wrote: > Dag-Erling Sm??rgrav wrote: > > Doug Barton <do...@freebsd.org> writes: > >> Dag-Erling Sm??rgrav <d...@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, > > The -U option works by comparing the installed files to the mtree file > created from the unmodified source files. If the file is listed as > having been changed, the -U option ignores it. If not, it > auto-installs it.
Is it not possible to change the logic of -U a little. Only auto install if it is in mtree and has not changed. So if it has changed or is not in mtree, skip the auto install. John -- John Hay -- j...@meraka.csir.co.za / j...@freebsd.org _______________________________________________ freebsd-hackers@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-hackers To unsubscribe, send any mail to "freebsd-hackers-unsubscr...@freebsd.org"
