From owner-p4-projects@FreeBSD.ORG  Mon Aug  1 14:47:53 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0896C16A421; Mon,  1 Aug 2005 14:47:53 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 D257F16A41F
	for <perforce@freebsd.org>; Mon,  1 Aug 2005 14:47:52 +0000 (GMT)
	(envelope-from soc-saturnero@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9EAAC43D46
	for <perforce@freebsd.org>; Mon,  1 Aug 2005 14:47:52 +0000 (GMT)
	(envelope-from soc-saturnero@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j71ElqTT093242
	for <perforce@freebsd.org>; Mon, 1 Aug 2005 14:47:52 GMT
	(envelope-from soc-saturnero@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j71ElqVb093239
	for perforce@freebsd.org; Mon, 1 Aug 2005 14:47:52 GMT
	(envelope-from soc-saturnero@freebsd.org)
Date: Mon, 1 Aug 2005 14:47:52 GMT
Message-Id: <200508011447.j71ElqVb093239@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-saturnero@freebsd.org using -f
From: soc-saturnero <soc-saturnero@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 81281 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Mon, 01 Aug 2005 14:47:53 -0000

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

Change 81281 by soc-saturnero@soc-saturnero_sberta on 2005/08/01 14:46:55

	rc script for uzip mount

Affected files ...

.. //depot/projects/soc2005/freesbie/conf/rc.d/uzip#1 add
.. //depot/projects/soc2005/freesbie/scripts/clonefs.sh#2 edit

Differences ...

==== //depot/projects/soc2005/freesbie/scripts/clonefs.sh#2 (text+ko) ====

@@ -102,9 +102,15 @@
 	mkdir -p ${CLONEDIR}/uzip
 	
 	USRDEVICE=$(create_vnode ${CLONEDIR}/uzip/usr.ufs usr)
-	VARDEVICE=$(create_vnode ${CLONEDIR}/uzip/var.ufs var)
-	
-	trap "umount_md_devices ${USRDEVICE} ${VARDEVICE}; exit 1" INT
+	DEVICES=${USRDEVICE}
+
+	# When NO_UNIONFS is set, we prefer using a mdmfs var (created
+	# automatically by rc.d scripts
+	if [ -z "${NO_UNIONFS:-}" ]; then
+	    VARDEVICE=$(create_vnode ${CLONEDIR}/uzip/var.ufs var)
+	    DEVICES=${DEVICES} ${VARDEVICE}
+	fi
+	trap "umount_md_devices ${DEVICES}; exit 1" INT
     fi
 
     cd ${BASEDIR}
@@ -112,10 +118,16 @@
     find . -print -depth | cpio -pvudm ${CLONEDIR} >> ${LOGFILE} 2>&1
 
     if [ -z "${NO_COMPRESSEDFS:-}" ]; then
-	umount_md_devices ${USRDEVICE} ${VARDEVICE}
+	umount_md_devices ${DEVICES}
 	trap "" INT
 	uzip $CLONEDIR/uzip/usr.ufs $CLONEDIR/uzip/usr.uzip
-	uzip $CLONEDIR/uzip/var.ufs $CLONEDIR/uzip/var.uzip	
+	if [ -z "${NO_UNIONFS:-}" ]; then
+	    uzip $CLONEDIR/uzip/var.ufs $CLONEDIR/uzip/var.uzip	
+	fi
+
+	#Copy the rc script
+	cp ${LOCALDIR}/conf/rc.d/uzip ${CLONEDIR}/etc/rc.d/
+	chmod 555 ${CLONEDIR}/etc/rc.d/uzip
     fi
 }