Date: Sat, 4 Jun 2005 23:07:05 +0200 From: "Simon L. Nielsen" <simon@FreeBSD.org> To: Ceri Davies <ceri@submonkey.net>, Giorgos Keramidas <keramida@ceid.upatras.gr>, Robert Watson <rwatson@freebsd.org>, src-committers@freebsd.org, cvs-src@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/etc/mtree BSD.root.dist Message-ID: <20050604210704.GH779@zaphod.nitro.dk> In-Reply-To: <20050604210237.GM14221@submonkey.net> References: <200505302051.j4UKpDdf066810@repoman.freebsd.org> <20050604190643.GA1615@gothmog.gr> <20050604210237.GM14221@submonkey.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--BXVAT5kNtrzKuDFl
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
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@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 wil=
l 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 w=
ith
> > > a directory?
> >=20
> > 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).
>=20
> Agreed. Plus:
>=20
> shrike-{~} % uname -sr
> FreeBSD 4.11-STABLE
> shrike-{~} % ll /etc/security
> ls: /etc/security: No such file or directory
> shrike-{~} %
>=20
> 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.
--=20
Simon L. Nielsen
--BXVAT5kNtrzKuDFl
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (FreeBSD)
iD8DBQFCohf4h9pcDSc1mlERAhEUAJ4ghXdbqelhQytau4lbOC3DTFlxKQCghtsE
5Q2RFNkZ3/Ra9dF/jdq6EJU=
=uDVc
-----END PGP SIGNATURE-----
--BXVAT5kNtrzKuDFl--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050604210704.GH779>