From owner-p4-projects  Mon Oct  7 14:16: 0 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BFB4637B404; Mon,  7 Oct 2002 14:15:57 -0700 (PDT)
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 5177937B406
	for <perforce@freebsd.org>; Mon,  7 Oct 2002 14:15:57 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DE8BE43E77
	for <perforce@freebsd.org>; Mon,  7 Oct 2002 14:15:56 -0700 (PDT)
	(envelope-from green@freebsd.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g97LFuCo068105
	for <perforce@freebsd.org>; Mon, 7 Oct 2002 14:15:56 -0700 (PDT)
	(envelope-from green@freebsd.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g97LFuku068102
	for perforce@freebsd.org; Mon, 7 Oct 2002 14:15:56 -0700 (PDT)
Date: Mon, 7 Oct 2002 14:15:56 -0700 (PDT)
Message-Id: <200210072115.g97LFuku068102@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f
From: Brian Feldman <green@FreeBSD.org>
Subject: PERFORCE change 18886 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=18886

Change 18886 by green@green_laptop_2 on 2002/10/07 14:15:16

	Perform the labeling on all "multilabel" ufs mounts currently in
	use, not just /.

Affected files ...

.. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/Makefile#5 edit

Differences ...

==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/Makefile#5 (text+ko) ====

@@ -1,11 +1,14 @@
 CHECKPOLICY = /sbin/sebsd_checkpolicy
 SETFILES = /sbin/sebsd_setfiles
-M4 = m4 -Imacros -s
+M4 = /usr/bin/m4 -Imacros -s
 
 INSTALLDIR = /etc/security/sebsd
 #FLASKDIR = $(INSTALLDIR)/flask
 FLASKDIR = flask
 
+MULTILABELMOUNTS != /sbin/mount -t ufs -p | \
+	/usr/bin/awk '{if (match($$4, "multilabel")) {print $$2}}'
+
 POLICYVER := policy.$(shell $(CHECKPOLICY) -V)
 
 LOADPATH = $(INSTALLDIR)/$(POLICYVER)
@@ -64,7 +67,7 @@
 	cat $> > $@
 
 relabel: $(FC)
-	$(SETFILES) $(FC) /
+	$(SETFILES) $(FC) $(MULTILABELMOUNTS)
 
 $(FC): $(FCFILES)
 	cat $> > $@

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