1 files changed, 11 insertions, 37 deletions

diff --git a/release/Makefile b/release/Makefile
index 9928f892e492..18f2f37be2c0 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.214 1996/05/02 08:18:28 jkh Exp $
+#	$Id: Makefile,v 1.215 1996/05/16 03:20:52 jkh Exp $
 #
 # How to roll a release:
 #
@@ -56,7 +56,7 @@ FD=			${RELEASEDIR}/ftp
 CD=			${RELEASEDIR}/cdrom
 
 .if !defined(WHICH_CRUNCH)
-WHICH_CRUNCH=	boot root fixit
+WHICH_CRUNCH=	boot fixit
 .endif
 
 rerelease release:
@@ -119,7 +119,7 @@ whap:
 	  sed "s/__RELEASE/${BUILDNAME}/" version.h > version.h.new && mv version.h.new version.h )
 
 clean:
-	rm -rf root_crunch boot_crunch release.[0-9] release.1[0]
+	rm -rf boot_crunch release.[0-9] release.1[0]
 
 # Clean out ${RELEASEDIR} and make the directory structure.
 release.1:
@@ -368,6 +368,8 @@ release.8: write_mfs_in_kernel
 	# add more stuff for the complete bootfd
 	tar --exclude CVS -cf - -C ${.CURDIR}/sysinstall help | \
 		tar xvf - -C ${RD}/mfsfd/stand
+	cp ${.CURDIR}/sysinstall/power.uu ${RD}/mfsfd/stand && \
+		cd ${RD}/mfsfd/stand && uudecode power.uu && rm power.uu
 	sh -e ${.CURDIR}/doFS.sh ${RD} ${MNT} ${BOOTMFSSIZE} ${RD}/mfsfd \
 		${MFSINODE} minimum
 	mv fs-image fs-image.std
@@ -380,32 +382,9 @@ release.8: write_mfs_in_kernel
 	touch release.8
 
 #
-# --==## Create a root floppy ##==--
-#
-release.9:
-	@cd ${.CURDIR} && $(MAKE) ckRELEASEDIR
-	rm -rf ${RD}/rootfd
-	mkdir ${RD}/rootfd
-	cd ${RD}/rootfd && \
-		mkdir stand stand/info
-	@cd ${.CURDIR} && $(MAKE) installCRUNCH CRUNCH=root \
-		DIR=${RD}/rootfd/stand ZIP=false
-	tar --exclude CVS -cf - -C ${RD} info | tar xvf - -C ${RD}/rootfd/stand
-	tar -cf - -C ${RD}/trees/bin/dev MAKEDEV | \
-		tar xvf - -C ${RD}/rootfd/stand
-	cp ${.CURDIR}/sysinstall/power.uu ${RD}/rootfd/stand && \
-		cd ${RD}/rootfd/stand && uudecode power.uu && rm power.uu
-	cd ${RD}/rootfd && \
-		( rm -f OK && find . -print && touch OK && echo OK ) | \
-		cpio -H newc -oa | gzip -9 -c | \
-		dd conv=osync > ${RD}/floppies/root.tmp
-	mv ${RD}/floppies/root.tmp ${RD}/floppies/root.flp
-	touch release.9
-
-#
 # --==## Create a fixit floppy ##==--
 #
-release.10:
+release.9:
 	@cd ${.CURDIR} && $(MAKE) ckRELEASEDIR
 	rm -rf ${RD}/fixitfd
 	mkdir ${RD}/fixitfd
@@ -421,7 +400,7 @@ release.10:
 	sh -e ${.CURDIR}/doFS.sh ${RD} ${MNT} ${FDSIZE} ${RD}/fixitfd \
 		10000 ${FDLABEL}
 	mv fs-image ${RD}/floppies/fixit.flp
-	touch release.10
+	touch release.9
 
 #
 # --==## Setup a suitable ftp-area ##==--
@@ -471,17 +450,16 @@ doTARBALL:
 		${ZIPNSPLIT} ${RD}/dists/${TD}/$$tn. && \
 		cd ${RD}/info && \
 		mkdir -p ${TD} && \
-		sh ${.CURDIR}/info.sh ${RD}/dists/${TD}/$$tn > ${TD}/$$tn.inf \
+		sh ${.CURDIR}/info.sh ${RD}/dists/${TD}/$$tn > ${RD}/dists/${TD}/$$tn.inf \
 	)
 
 doRELEASE:  release.1 release.2 release.3 release.4 release.5 release.6 \
-		release.7 release.8 release.9 release.10
+		release.7 release.8 release.9
 	cd ${.CURDIR} && ${MAKE} cdrom.1 ftp.1
 	@echo "Release done"
 
 floppies:
 	cd ${.CURDIR} && ${MAKE} boot.flp
-	cd ${.CURDIR} && ${MAKE} root.flp
 	cd ${.CURDIR} && ${MAKE} fixit.flp
 	cd ${RD} && find floppies -print | cpio -dumpl ${FD}
 
@@ -489,13 +467,9 @@ boot.flp:
 	rm -f release.4 release.8
 	cd ${.CURDIR} && ${MAKE} release.4 release.8 WHICH_CRUNCH=boot
 
-root.flp:
-	rm -f release.4 release.9
-	cd ${.CURDIR} && ${MAKE} release.4 release.9 WHICH_CRUNCH=root
-
 fixit.flp:
-	rm -f release.4 release.10
-	cd ${.CURDIR} && ${MAKE} release.4 release.10 WHICH_CRUNCH=fixit
+	rm -f release.4 release.9
+	cd ${.CURDIR} && ${MAKE} release.4 release.9 WHICH_CRUNCH=fixit
 
 write_mfs_in_kernel:	${.CURDIR}/write_mfs_in_kernel.c
 	${CC} ${CFLAGS} -o write_mfs_in_kernel ${.CURDIR}/write_mfs_in_kernel.c