Various fixes, take power.uu out as it was causing overflows. We'll

need to fetch it dynamically rather than keep it in the source tree
(subject of a follow-up commit).

3 files changed, 16 insertions, 20 deletions

diff --git a/release/Makefile b/release/Makefile
index fad09d3..f7b8760 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.217 1996/05/29 04:13:17 jkh Exp $
+#	$Id: Makefile,v 1.193.2.48 1996/06/06 22:53:21 jkh Exp $
 #
 # How to roll a release:
 #
@@ -36,10 +36,6 @@ MNT=			/mnt
 # other floppy parameters.
 FDSIZE=			1200
 FDLABEL=		fd1200
-FDINODE=		4300
-
-NEWFSARGS=		-c 80 -b 4096 -f 512 -i 4000 -m 0 -t 0 -u 0 \
-				-o space -T ${FDLABEL}
 
 ZIPNSPLIT=		gzip --no-name -9 -c | split -b 240640 -
 
@@ -370,6 +366,7 @@ release.8: write_mfs_in_kernel
 	echo "domain          53/udp          nameserver" >> ${RD}/mfsfd/stand/etc/services
 	install -c ${.CURDIR}/../COPYRIGHT ${RD}/mfsfd/stand/help/COPYRIGHT.hlp
 	# make the small bootfd
+	@echo "Making the small 4MB boot floppy."
 	sh -e ${.CURDIR}/doFS.sh ${RD} ${MNT} ${BOOTMFSSIZE} ${RD}/mfsfd \
 		${MFSINODE} minimum
 	mv fs-image fs-image.4
@@ -377,17 +374,14 @@ 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
+	@echo "Making the regular boot floppy."
 	sh -e ${.CURDIR}/doFS.sh ${RD} ${MNT} ${BOOTMFSSIZE} ${RD}/mfsfd \
 		${MFSINODE} minimum
 	mv fs-image fs-image.std
 	mv fs-image.size fs-image.std.size
-	#rm -rf ${.CURDIR}/../sys/compile/BOOTMFS 
 	cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=4
 	cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=std
 	mv ${RD}/floppies/bootstd.flp ${RD}/floppies/boot.flp
-	#rm -rf ${.CURDIR}/../sys/compile/BOOTMFS 
 	touch release.8
 
 #
@@ -542,7 +536,7 @@ doMFSKERN:
 	  echo "options  NFS_NOSERVER" >> BOOTMFS && \
 	  echo 'options  "MAXCONS=4"' >> BOOTMFS && \
 	  echo "options \"MFS_ROOT=`cat fs-image.${FSIMAGE}.size`\"" >> BOOTMFS
-	${MAKE} doKERNEL KERNEL=BOOTMFS
+	cd ${.CURDIR} && ${MAKE} doKERNEL KERNEL=BOOTMFS
 	rm -rf ${RD}/boot.${FSIMAGE}
 	mkdir  ${RD}/boot.${FSIMAGE}
 	mv ${RD}/kernels/BOOTMFS ${RD}/kernels/BOOTMFS.${FSIMAGE}
diff --git a/release/info.sh b/release/info.sh
index 1f58732..b1c8c53 100644
--- a/release/info.sh
+++ b/release/info.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
-ls $1.* | wc | awk '{ print "Pieces = ",$1 }'
-for FILE in $1.*; do \
-PIECE=`echo $FILE | cut -d . -f 2` ; \
-echo -n "cksum.$PIECE = "; \
-cksum $FILE | awk ' { print $1,$2 } '
+# $ANA: info.sh,v 1.3 1996/06/04 16:25:30 wollman Exp $
+ls $1.[a-z][a-z] | wc | awk '{ print "Pieces = ",$1 }'
+for FILE in $1.[a-z][a-z]; do
+       PIECE=`echo $FILE | cut -d . -f 2`
+       echo -n "cksum.$PIECE = "
+       cksum $FILE | awk ' { print $1,$2 } '
 done
diff --git a/release/scripts/info.sh b/release/scripts/info.sh
index 1f58732..b1c8c53 100644
--- a/release/scripts/info.sh
+++ b/release/scripts/info.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
-ls $1.* | wc | awk '{ print "Pieces = ",$1 }'
-for FILE in $1.*; do \
-PIECE=`echo $FILE | cut -d . -f 2` ; \
-echo -n "cksum.$PIECE = "; \
-cksum $FILE | awk ' { print $1,$2 } '
+# $ANA: info.sh,v 1.3 1996/06/04 16:25:30 wollman Exp $
+ls $1.[a-z][a-z] | wc | awk '{ print "Pieces = ",$1 }'
+for FILE in $1.[a-z][a-z]; do
+       PIECE=`echo $FILE | cut -d . -f 2`
+       echo -n "cksum.$PIECE = "
+       cksum $FILE | awk ' { print $1,$2 } '
 done