PERFORCE change 79468 for review

[soc-andrew]

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

Change 79468 by soc-andrew at 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) ====