Date: Fri, 8 Jul 2005 01:16:41 GMT From: soc-andrew <soc-andrew@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 79739 for review Message-ID: <200507080116.j681GfIY013124@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=79739 Change 79739 by soc-andrew@soc-andrew_serv on 2005/07/08 01:15:49 Get a release CD to boot to multi-user mode to use to install the BSD Installer with. Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#3 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#3 (text+ko) ==== @@ -755,6 +755,29 @@ @gzip -9fnv ${RD}/mfsroot/mfsroot touch ${.TARGET} +# Build the BSD Installer mfs images +release.9: + rm -rf ${RD}/bsdinstaller + mkdir ${RD}/bsdinstaller + ( for dir in root usr var ; do \ + mkdir ${RD}/bsdinstaller/$$dir; \ + done ) + # Copy the files we need in the root + ( for dir in bin etc libexec lib sbin ; 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 \ + mkdir ${RD}/bsdinstaller/root/$$dir; \ + done ) + @echo "/dev/acd0 /usr cd9660 ro 0 0" > ${RD}/bsdinstaller/root/etc/fstab + sh -e ${DOFS_SH} ${RD}/bsdinstaller/mfsroot ${RD} ${MNT} \ + 10000 ${RD}/bsdinstaller/root ${MFSINODE} auto + @gzip -9fnv ${RD}/bsdinstaller/mfsroot + touch ${.TARGET} + KERNFLOPPYSET= ${RD}/floppyset/kern/kernel.gz .if defined(SMALLFLOPPYSIZE) SMALLKERNFLOPPYSET= ${RD}/floppyset/kern-small/kernel.gz @@ -888,6 +911,7 @@ cdrom.1: @echo "Building CDROM live filesystem image" @mkdir -p ${CD_LIVEFS} +.if !defined(BSDINSTALLER) @for i in ${DISTRIBUTIONS} ; \ do \ if [ -d ${RD}/trees/$${i} ] ; then \ @@ -896,15 +920,25 @@ find . -depth -print | cpio -dumpl ${CD_LIVEFS} ) ; \ fi \ done +.else + ( tar --exclude CVS -cf - -C ${RD}/trees/base/usr . | \ + tar xf - -C ${CD_LIVEFS} ) + @rm -fr ${CD_LIVEFS}/boot + @mkdir ${CD_LIVEFS}/boot + ( tar --exclude CVS -cf - -C ${RD}/trees/base/boot . | \ + tar xf - -C ${CD_LIVEFS}/boot ) +.endif @rm -f ${CD_LIVEFS}/.profile @cp ${.CURDIR}/fixit.profile ${CD_LIVEFS}/.profile @ln -sf /rescue ${CD_LIVEFS}/stand .if ${TARGET} != "pc98" + @echo "Setting up CDROM boot area" + @rm -f ${CD_LIVEFS}/boot/loader.conf .if defined(BSDINSTALLER) - @echo '/dev/acd0 / cd9660 ro 0 0' > ${CD_LIVEFS}/etc/fstab + @cp ${RD}/bsdinstaller/mfsroot.gz ${CD_LIVEFS}/boot/mfsroot.gz .else - @echo "Setting up CDROM boot area" - @rm -f ${CD_LIVEFS}/boot/loader.conf + @cp ${RD}/mfsroot/mfsroot.gz ${CD_LIVEFS}/boot/mfsroot.gz +.endif @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 @@ -1093,7 +1127,7 @@ ) doRELEASE: release.1 release.2 ${DOCREL} release.3 release.4 \ - release.5 release.6 release.7 release.8 ${EXTRAS} + release.5 release.6 release.7 release.8 release.9 ${EXTRAS} @echo "Release done" floppies:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200507080116.j681GfIY013124>