From owner-p4-projects@FreeBSD.ORG  Wed Jan 14 12:24:00 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1BDC216A4D2; Wed, 14 Jan 2004 12:24:00 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D0FBA16A4CE
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 12:23:59 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 52CD843D6D
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 12:22:42 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0EKLg0B099005
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 12:21:42 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0EKLgic098999
	for perforce@freebsd.org; Wed, 14 Jan 2004 12:21:42 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 14 Jan 2004 12:21:42 -0800 (PST)
Message-Id: <200401142021.i0EKLgic098999@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45353 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jan 2004 20:24:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=45353

Change 45353 by rwatson@rwatson_tislabs on 2004/01/14 12:21:39

	Create /var and /tmp as multi-label file systems, and perform
	a touch of initial labeling.  This was lost when rc.diskless[12]
	moved to rcNG bits.

Affected files ...

.. //depot/projects/trustedbsd/mac/etc/rc.d/diskless#11 edit
.. //depot/projects/trustedbsd/mac/etc/rc.d/initdiskless#11 edit

Differences ...

==== //depot/projects/trustedbsd/mac/etc/rc.d/diskless#11 (text+ko) ====

@@ -47,7 +47,7 @@
 	if [ -n "$3" ]; then
 		bpi="-i $3"
 	fi
-	/sbin/mdmfs $bpi -s $1 -M md $2
+	/sbin/mdmfs $bpi -s $1 -l -M md $2
 }
 
 # If there is a global system configuration file, suck it in.
@@ -95,6 +95,15 @@
 	;;
 esac
 
+if sysctl security.mac > /dev/null 2>&1 ; then
+	setfmac biba/equal,mls/equal,te/equal /var/tmp
+	setfmac biba/equal,mls/equal,te/equal /var/tmp/vi.recover
+	setfmac biba/equal,mls/equal,te/equal /var/spool/lock
+	setfmac biba/equal,mls/equal,te/mailqueue_t /var/spool/mqueue
+	setfmac biba/equal,mls/equal,te/maildir_t /var/mail
+	setfmac biba/equal,mls/equal,te/equal /var/run
+fi
+
 echo "+++ create log files based on the contents of /etc/newsyslog.conf"
 LOGFILES=`/usr/bin/awk '$1 != "#" { printf "%s ", $1 } ' /etc/newsyslog.conf`
 if [ -n "$LOGFILES" ]; then

==== //depot/projects/trustedbsd/mac/etc/rc.d/initdiskless#11 (text+ko) ====

@@ -103,7 +103,7 @@
 # Create a generic memory disk
 #
 mount_md() {
-    /sbin/mdmfs -i 4096 -s $1 -M md $2
+    /sbin/mdmfs -i 4096 -s $1 -l -M md $2
 }
 
 # Create the memory filesystem if it has not already been created