Date: Fri, 10 May 2002 22:39:38 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 11153 for review Message-ID: <200205110539.g4B5dc801196@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205110539.g4B5dc801196>