From owner-p4-projects@FreeBSD.ORG  Sun Jul  3 11:41:06 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 0224E16A420; Sun,  3 Jul 2005 11:41:05 +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 CB6D816A41C
	for <perforce@freebsd.org>; Sun,  3 Jul 2005 11:41:05 +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 9DD1A43D4C
	for <perforce@freebsd.org>; Sun,  3 Jul 2005 11:41:05 +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 j63Bf584078671
	for <perforce@freebsd.org>; Sun, 3 Jul 2005 11:41:05 GMT
	(envelope-from soc-andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j63Bf5ID078668
	for perforce@freebsd.org; Sun, 3 Jul 2005 11:41:05 GMT
	(envelope-from soc-andrew@freebsd.org)
Date: Sun, 3 Jul 2005 11:41:05 GMT
Message-Id: <200507031141.j63Bf5ID078668@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 79468 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: Sun, 03 Jul 2005 11:41:06 -0000

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

Change 79468 by soc-andrew@soc-andrew_serv on 2005/07/03 11:40:35

	Start to get BSD Installer to work with the Install CDs

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/scripts/build_patch.sh#2 edit
.. //depot/projects/soc2005/bsdinstaller/scripts/build_release.sh#2 edit
.. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#2 edit
.. //depot/projects/soc2005/bsdinstaller/src/release/i386/mkisoimages.sh#2 edit

Differences ...

==== //depot/projects/soc2005/bsdinstaller/scripts/build_patch.sh#2 (text+ko) ====

@@ -3,7 +3,7 @@
 # Script to create a patch and tarballs of files to use in release(7)
 
 # The files to diff
-FILES="lib/Makefile usr.sbin/Makefile"
+FILES="lib/Makefile usr.sbin/Makefile release/Makefile"
 
 # Dir's to create a tarball of:name for tarball
 DIRS="contrib/bsdinstaller:base lib/bsdinstaller:lib usr.sbin/bsdinstaller:usr_sbin"

==== //depot/projects/soc2005/bsdinstaller/scripts/build_release.sh#2 (text+ko) ====

@@ -13,6 +13,6 @@
 
 cd ${SRC_DIR}/release
 
-sudo make release CHROOTDIR=${CHROOTDIR} CVSROOT=${CVSROOT} BUILDNAME=${BUILDNAME} LOCAL_PATCHES=${PATCH_DIR}/bsd_install.diff LOCAL_SCRIPT=${PATCH_DIR}/local_script.sh -DMAKE_ISOS -DNODOC -DNOPORTS
+sudo make release CHROOTDIR=${CHROOTDIR} CVSROOT=${CVSROOT} BUILDNAME=${BUILDNAME} LOCAL_PATCHES=${PATCH_DIR}/bsd_install.diff LOCAL_SCRIPT=${PATCH_DIR}/local_script.sh -DMAKE_ISOS -DNODOC -DNOPORTS -DBSDINSTALLER
 
 cd $WD

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

@@ -448,6 +448,7 @@
 .for var in \
 	AUTO_KEYBOARD_DETECT \
 	BUILDNAME \
+	BSDINSTALLER \
 	CD_PACKAGE_TREE \
 	DISTRIBUTIONS \
 	DOC_LANG \
@@ -899,12 +900,16 @@
 	@cp ${.CURDIR}/fixit.profile ${CD_LIVEFS}/.profile
 	@ln -sf /rescue ${CD_LIVEFS}/stand
 .if ${TARGET} != "pc98"
+.if defined(BSDINSTALLER)
+	@echo '/dev/acd0 / cd9660 ro 0 0' > ${CD_LIVEFS}/etc/fstab
+.else
 	@echo "Setting up CDROM boot area"
 	@rm -f ${CD_LIVEFS}/boot/loader.conf
 	@cp ${RD}/mfsroot/mfsroot.gz ${CD_LIVEFS}/boot/mfsroot.gz
 	@echo 'mfsroot_load="YES"' > ${CD_LIVEFS}/boot/loader.conf
 	@echo 'mfsroot_type="mfs_root"' >> ${CD_LIVEFS}/boot/loader.conf
 	@echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_LIVEFS}/boot/loader.conf
+.endif
 .if exists(${RD}/trees/base/boot/device.hints)
 	# Break the link to device.hints so we can modify it
 	@rm -f ${CD_LIVEFS}/boot/device.hints

==== //depot/projects/soc2005/bsdinstaller/src/release/i386/mkisoimages.sh#2 (text+ko) ====