From owner-p4-projects  Fri May 10 22:39:44 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 02AA337B403; Fri, 10 May 2002 22:39:40 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id CB75C37B407
	for <perforce@freebsd.org>; Fri, 10 May 2002 22:39:38 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g4B5dc801196
	for perforce@freebsd.org; Fri, 10 May 2002 22:39:38 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 10 May 2002 22:39:38 -0700 (PDT)
Message-Id: <200205110539.g4B5dc801196@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 11153 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11153

Change 11153 by rwatson@rwatson_paprika on 2002/05/10 22:39:20

	Document the fact that under RELENG_4, /etc/security is a
	file, and that mergemaster gets confused if asked to upgrade
	a file to a directory.  Probably, we should fix mergemaster.

Affected files ...

... //depot/projects/trustedbsd/mac/MACREADME#17 edit

Differences ...

==== //depot/projects/trustedbsd/mac/MACREADME#17 (text+ko) ====

@@ -120,4 +120,10 @@
 Things that look like they should work but don't
 ------------------------------------------------
 
-Nothing on this list right now.
+Under RELENG_4, /etc/security is a file; in the TrustedBSD MAC branch,
+it's a directory.  If you're upgrading from RELENG_4,
+
+  rm -f /etc/security
+
+before running mergemaster, as mergemaster gets confused if a
+file is replaced with a directory.

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message