Date: Sat, 04 Jun 2005 17:47:43 -0600 (MDT) From: "M. Warner Losh" <imp@bsdimp.com> To: keramida@ceid.upatras.gr 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 Message-ID: <20050604.174743.00475137.imp@bsdimp.com> 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
In message: <20050604190643.GA1615@gothmog.gr>
Giorgos Keramidas <keramida@ceid.upatras.gr> writes:
: 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).
Actually it is supported. But you have to go through 5.x first. And
many systems have been thus upgraded.
Warner
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050604.174743.00475137.imp>