From owner-cvs-src@FreeBSD.ORG Sat Jun 4 21:02:39 2005 Return-Path: X-Original-To: cvs-src@freebsd.org Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CC40316A41C; Sat, 4 Jun 2005 21:02:39 +0000 (GMT) (envelope-from setantae@submonkey.net) Received: from shrike.submonkey.net (cpc4-cdif3-6-1-cust116.cdif.cable.ntl.com [82.23.41.116]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E50743D49; Sat, 4 Jun 2005 21:02:39 +0000 (GMT) (envelope-from setantae@submonkey.net) Received: from setantae by shrike.submonkey.net with local (Exim 4.51 (FreeBSD)) id 1Defmv-000Jlw-U0; Sat, 04 Jun 2005 22:02:37 +0100 Date: Sat, 4 Jun 2005 22:02:37 +0100 From: Ceri Davies To: Giorgos Keramidas Message-ID: <20050604210237.GM14221@submonkey.net> Mail-Followup-To: Ceri Davies , Giorgos Keramidas , Robert Watson , src-committers@freebsd.org, cvs-src@freebsd.org, cvs-all@freebsd.org References: <200505302051.j4UKpDdf066810@repoman.freebsd.org> <20050604190643.GA1615@gothmog.gr> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ANwsuk3Muel3MOM0" Content-Disposition: inline In-Reply-To: <20050604190643.GA1615@gothmog.gr> X-PGP: finger ceri@FreeBSD.org User-Agent: Mutt/1.5.9i Sender: Ceri Davies Cc: cvs-src@freebsd.org, src-committers@freebsd.org, Robert Watson , cvs-all@freebsd.org Subject: Re: cvs commit: src/etc/mtree BSD.root.dist X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jun 2005 21:02:40 -0000 --ANwsuk3Muel3MOM0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Jun 04, 2005 at 10:06:43PM +0300, Giorgos Keramidas wrote: > On 2005-05-30 20:51, Robert Watson 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? >=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). 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 --=20 Only two things are infinite, the universe and human stupidity, and I'm not sure about the former. -- Einstein (attrib.) --ANwsuk3Muel3MOM0 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (FreeBSD) iD8DBQFCohbtocfcwTS3JF8RAosrAJ4wv2pmZUZlohLGq89wjuAvNitsIQCgpkMm K1UmKR6SXUCO2mgp9KStwoM= =LRJN -----END PGP SIGNATURE----- --ANwsuk3Muel3MOM0--