From owner-p4-projects@FreeBSD.ORG  Wed Feb  8 23:08:40 2006
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 0EBF716A423; Wed,  8 Feb 2006 23:08:40 +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 DBCA416A420
	for <perforce@freebsd.org>; Wed,  8 Feb 2006 23:08:39 +0000 (GMT)
	(envelope-from soc-andrew@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A60C243D45
	for <perforce@freebsd.org>; Wed,  8 Feb 2006 23:08:39 +0000 (GMT)
	(envelope-from soc-andrew@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 k18N8dZh037333
	for <perforce@freebsd.org>; Wed, 8 Feb 2006 23:08:39 GMT
	(envelope-from soc-andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k18N8dvr037330
	for perforce@freebsd.org; Wed, 8 Feb 2006 23:08:39 GMT
	(envelope-from soc-andrew@freebsd.org)
Date: Wed, 8 Feb 2006 23:08:39 GMT
Message-Id: <200602082308.k18N8dvr037330@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-andrew@freebsd.org using -f
From: soc-andrew <soc-andrew@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 91406 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: Wed, 08 Feb 2006 23:08:40 -0000

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

Change 91406 by soc-andrew@soc-andrew_serv on 2006/02/08 23:08:37

	Update the comment on what release.9 is for
	Only put /etc/rc.d/bsdinstaller on the CD as it is used to mount /usr from a CD device

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#28 edit

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#28 (text+ko) ====

@@ -778,7 +778,7 @@
 	@true
 .endif
 
-# Build the BSD Installer mfs images
+# Build the BSD Installer File system
 release.9:
 .if defined(BSDINSTALLER)
 	rm -rf ${RD}/bsdinstaller
@@ -813,8 +813,6 @@
 	@mkdir -p ${RD}/bsdinstaller/root/var/tmp
 	cp ${.CURDIR}/bsdinstaller/bsdinstaller_shell.sh ${RD}/bsdinstaller/root/
 	chmod u+x ${RD}/bsdinstaller/root/bsdinstaller_shell.sh
-	cp ${.CURDIR}/bsdinstaller/bsdinstaller ${RD}/bsdinstaller/root/etc/rc.d/
-	chmod u+x ${RD}/bsdinstaller/root/etc/rc.d/bsdinstaller
 	cp ${RD}/bsdinstaller/root/etc/master.passwd ${RD}/bsdinstaller/master.passwd
 	@echo "bsdinstaller::0:0::0:0:BSD Installer:/root:/bsdinstaller_shell.sh" >> ${RD}/bsdinstaller/master.passwd
 	pwd_mkdb -p -d ${RD}/bsdinstaller/root/etc \
@@ -988,6 +986,8 @@
 	( for dir in dev mnt proc root tmp usr var ; do \
 		mkdir ${RD}/bsdinstaller/mfs_root/$$dir; \
 	done )
+	cp ${.CURDIR}/bsdinstaller/bsdinstaller ${RD}/bsdinstaller/mfs_root/etc/rc.d/
+	chmod u+x ${RD}/bsdinstaller/mfs_root/etc/rc.d/bsdinstaller
 	cp ${.CURDIR}/bsdinstaller/bsdinstaller_shell.sh ${RD}/bsdinstaller/mfs_root/
 	chmod u+x ${RD}/bsdinstaller/mfs_root/bsdinstaller_shell.sh
 	ln -s /usr/boot ${RD}/bsdinstaller/mfs_root/boot