PERFORCE change 91389 for review

[soc-andrew]

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

Change 91389 by soc-andrew at soc-andrew_serv on 2006/02/08 11:17:59

	Reorder the work done by release.9 and cdrom.1 to make building other boot types easier.
	Eg by duplicating $CHROOTDIR/R/stage/bsdinstaller/root/ to a nfs exported location it is possible to netboot the installer.

Affected files ...

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

Differences ...

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

@@ -783,22 +783,19 @@
 .if defined(BSDINSTALLER)
 	rm -rf ${RD}/bsdinstaller
 	mkdir ${RD}/bsdinstaller
-	( for dir in root usr var ; do \
-		mkdir ${RD}/bsdinstaller/$$dir; \
-	  done )
+	mkdir ${RD}/bsdinstaller/root
 	# Copy the files we need in the root
-	( for dir in bin etc libexec lib sbin ; do \
+	( for dir in bin boot etc libexec lib sbin usr ; do \
 		mkdir ${RD}/bsdinstaller/root/$$dir; \
 		tar --exclude CVS -cf - -C ${RD}/trees/base/$$dir . | \
                 tar xf - -C ${RD}/bsdinstaller/root/$$dir; \
 	  done )
 	# Create the needed mount points
-	( for dir in dev mnt proc root tmp usr var ; do \
+	( for dir in dev mnt proc root tmp var ; do \
 		mkdir ${RD}/bsdinstaller/root/$$dir; \
 	done )
 
 	@touch ${RD}/bsdinstaller/root/etc/fstab
-	ln -s /usr/boot ${RD}/bsdinstaller/root/boot
 	@echo "sendmail_enable=\"NONE\"" > ${RD}/bsdinstaller/root/etc/rc.conf
 	@echo "cron_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf
 	@echo "devd_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf
@@ -822,9 +819,6 @@
 	@echo "bsdinstaller::0:0::0:0:BSD Installer:/root:/bsdinstaller_shell.sh" >> ${RD}/bsdinstaller/master.passwd
 	pwd_mkdb -p -d ${RD}/bsdinstaller/root/etc \
                 ${RD}/bsdinstaller/master.passwd
-	sh -e ${DOFS_SH} ${RD}/bsdinstaller/mfsroot ${RD} ${MNT} \
-	  20000 ${RD}/bsdinstaller/root ${MFSINODE} auto
-	@gzip -9fnv ${RD}/bsdinstaller/mfsroot
 	touch ${.TARGET}
 .else
 	@true
@@ -975,12 +969,31 @@
 		fi \
 	done
 .else
-	( tar --exclude CVS -cf - -C ${RD}/trees/base/usr . | \
-		tar xf - -C ${CD_LIVEFS} )
+	# Setup the CD's contents
 	@rm -fr ${CD_LIVEFS}/boot
 	@mkdir ${CD_LIVEFS}/boot
-	( tar --exclude CVS -cf - -C ${RD}/trees/base/boot . | \
+	( tar --exclude CVS -cf - -C ${RD}/bsdinstaller/root/usr . | \
+		tar xf - -C ${CD_LIVEFS} )
+	( tar --exclude CVS -cf - -C ${RD}/bsdinstaller/root/boot . | \
 		tar xf - -C ${CD_LIVEFS}/boot )
+
+	# Create the mfsroot file
+	@rm -fr ${RD}/bsdinstaller/mfs_root
+	@mkdir ${RD}/bsdinstaller/mfs_root
+	( for dir in bin etc libexec lib sbin ; do \
+		mkdir ${RD}/bsdinstaller/mfs_root/$$dir; \
+		tar --exclude CVS -cf - -C ${RD}/bsdinstaller/root/$$dir . | \
+                tar xf - -C ${RD}/bsdinstaller/mfs_root/$$dir; \
+	  done )
+	( for dir in dev mnt proc root tmp usr var ; do \
+		mkdir ${RD}/bsdinstaller/mfs_root/$$dir; \
+	done )
+	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
+	sh -e ${DOFS_SH} ${RD}/bsdinstaller/mfsroot ${RD} ${MNT} \
+	  20000 ${RD}/bsdinstaller/mfs_root ${MFSINODE} auto
+	@gzip -9fnv ${RD}/bsdinstaller/mfsroot
 .endif
 	@rm -f ${CD_LIVEFS}/.profile
 	@cp ${.CURDIR}/fixit.profile ${CD_LIVEFS}/.profile