Date: Sat, 4 Jun 2005 22:02:37 +0100 From: Ceri Davies <ceri@submonkey.net> To: Giorgos Keramidas <keramida@ceid.upatras.gr> Cc: cvs-src@freebsd.org, src-committers@freebsd.org, Robert Watson <rwatson@freebsd.org>, cvs-all@freebsd.org Subject: Re: cvs commit: src/etc/mtree BSD.root.dist Message-ID: <20050604210237.GM14221@submonkey.net> In-Reply-To: <20050604190643.GA1615@gothmog.gr> References: <200505302051.j4UKpDdf066810@repoman.freebsd.org> <20050604190643.GA1615@gothmog.gr>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Sat, Jun 04, 2005 at 10:06:43PM +0300, Giorgos Keramidas wrote:
> On 2005-05-30 20:51, Robert Watson <rwatson@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.
Ceri
--
Only two things are infinite, the universe and human stupidity, and I'm
not sure about the former. -- Einstein (attrib.)
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (FreeBSD)
iD8DBQFCohbtocfcwTS3JF8RAosrAJ4wv2pmZUZlohLGq89wjuAvNitsIQCgpkMm
K1UmKR6SXUCO2mgp9KStwoM=
=LRJN
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050604210237.GM14221>