From owner-cvs-src@FreeBSD.ORG Sat Jun 4 23:48:03 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 90EC016A41C; Sat, 4 Jun 2005 23:48:03 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from harmony.village.org (berlin-qwest.village.org [168.103.84.175]) by mx1.FreeBSD.org (Postfix) with ESMTP id C9B4143D48; Sat, 4 Jun 2005 23:48:02 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.13.3/8.13.1) with ESMTP id j54NkunI056058; Sat, 4 Jun 2005 17:46:57 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Sat, 04 Jun 2005 17:47:43 -0600 (MDT) Message-Id: <20050604.174743.00475137.imp@bsdimp.com> To: keramida@ceid.upatras.gr From: "M. Warner Losh" In-Reply-To: <20050604190643.GA1615@gothmog.gr> References: <200505302051.j4UKpDdf066810@repoman.freebsd.org> <20050604190643.GA1615@gothmog.gr> X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, rwatson@FreeBSD.org, 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 23:48:03 -0000 In message: <20050604190643.GA1615@gothmog.gr> Giorgos Keramidas writes: : 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? : : 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). Actually it is supported. But you have to go through 5.x first. And many systems have been thus upgraded. Warner