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

[Simon L. Nielsen]

On 2005.06.04 22:02:37 +0100, Ceri Davies wrote:
> On Sat, Jun 04, 2005 at 10:06:43PM +0300, Giorgos Keramidas wrote:
> > 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).
> 
> Agreed.  Plus:
> 
> 	shrike-{~} % uname -sr
> 	FreeBSD 4.11-STABLE
> 	shrike-{~} % ll /etc/security
> 	ls: /etc/security: No such file or directory
> 	shrike-{~} %
> 
> I don't think we support anything other than the head of RELENG_4 ->
> -CURRENT either.

Actually I'm pretty sure that buildworld does not support 4.X -> 6.X,
only 4.X -> 5.X -> 6.X, since bootstrapping of some needed tools has
been removed after the RELENG_5 branchpoint.

-- 
Simon L. Nielsen
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-src/attachments/20050604/1fd70122/attachment.bin