cvs commit: src/etc/mtree BSD.root.dist

[Giorgos Keramidas]

On 2005-05-30 20:51, Robert Watson <rwatson at freebsd.org> wrote:
> rwatson     2005-05-30 20:51:13 UTC
>
>   FreeBSD src repository
>
>   Modified files:
>     etc/mtree            BSD.root.dist
>   Log:
>   Add /etc/security, into which the BSM audit configuration files will be
>   installed.  This is the same directory as found on Solaris.
>
>   NB: In FreeBSD 4.x and earlier, a script (file) named /etc/security
>   exists.  Does mergemaster need to be taught how to replace a file with
>   a directory?

mergemaster includes a check for "removed" files, but I'm not sure if it
can handle a directory entry that has a different file type.  IMHO, this
may have to be checked iff the /etc/security changes are MFC'ed to 5.X.
Otherwise, it shouldn't be a problem, since upgrading from 4.X to 6.X is
probably unsupported (or, at least, people who try it should be prepared
to pay great attention to details like this one).