Add bad144 to fixit floppy.

Remove kernel compile directories.
Put all *[sw]d* devices on floppies
Make more inodes on floppies as function of the above.

3 files changed, 15 insertions, 10 deletions

diff --git a/release/Makefile b/release/Makefile
index 8b089b2..cecfe82 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.131 1995/04/09 03:47:55 jkh Exp $
+#	$Id: Makefile,v 1.132 1995/04/10 08:01:27 phk Exp $
 #
 # How to roll a release:
 #
@@ -36,7 +36,7 @@ FDCYLS=			80
 FDCYLSIZE=		15k
 FDLABEL=		fd1200
 
-NEWFSARGS=		-c 80 -b 4096 -f 512 -i 9000 -m 0 -t 0 -u 0 \
+NEWFSARGS=		-c 80 -b 4096 -f 512 -i 7000 -m 0 -t 0 -u 0 \
 				-o space -T ${FDLABEL}
 
 ZIPNSPLIT=		gzip --no-name -9 -c | split -b 240640 -
@@ -142,6 +142,7 @@ release.3:
 			make depend && \
 			make kernel && \
 			cp kernel ${RD}/kernels/$$i ; \
+		rm -rf ${.CURDIR}/../sys/compile/$$i
 	done
 	rm -f ${.CURDIR}/../sys/i386/conf/BOOTCDROM
 	ln -f ${RD}/kernels/GENERIC ${RD}/trees/bin/kernel.GENERIC
@@ -230,8 +231,7 @@ release.6:
 	@cd ${.CURDIR} ; $(MAKE) ckRELEASEDIR
 	( cd ${RD}/trees/bin/dev ; \
 		ls console tty ttyv1 null zero \
-		sd[0123][a-h] wd[0123][a-h] fd[01] \
-		rsd[0123][a-h] rwd[0123][a-h] rfd[01] | \
+		*[sw]d* fd[01] rfd[01] | \
 	cpio -dump ${RD}/bootfd/dev )
 	install -c ${.CURDIR}/../COPYRIGHT ${RD}/bootfd
 	cd ${RD}/trees/bin/usr/share/FAQ/Text ; \
@@ -314,8 +314,7 @@ release.10:
 	@cd ${.CURDIR} ; $(MAKE) ckRELEASEDIR
 	( cd ${RD}/trees/bin/dev ; \
 		ls console tty ttyv1 null zero \
-		sd[0123][a-h] wd[0123][a-h] fd[01] \
-		rsd[0123][a-h] rwd[0123][a-h] rfd[01] | \
+		*[sw]d* fd[01] rfd[01] | \
 	cpio -dump ${RD}/fixitfd/dev )
 	ln -f ${RD}/fixitfd/stand/init ${RD}/fixitfd/sbin
 	ln -f ${RD}/fixitfd/stand/sh ${RD}/fixitfd/bin
@@ -335,6 +334,11 @@ ftp.1:
 	cd ${RD}/dists && find . -print | cpio -dumpl ${FD}
 	cd ${RD}/trees/bin/usr/share/FAQ/Text && ln -f ${FAQS} ${FD}
 
+	# This rule makes ${CHROOTDIR}/R/ftp a suitable anon ftp for testing.
+ftp.2:
+	-mkdir ${FD}/bin
+	ln -f ${RD}/trees/bin/bin/ls ${FD}/bin/ls
+
 cdrom.1:
 	rm -rf ${CD}
 	mkdir ${CD}
@@ -374,6 +378,7 @@ doTARBALL:
 
 doRELEASE:  release.1 release.2 release.3 release.4 release.5 release.6 \
 		release.7 release.8 release.9 release.10
+	cd ${.CURDIR} && ${MAKE} cdrom.1 ftp.1
 	@echo "Release done"
 
 ckRELEASEDIR:
diff --git a/release/alpha/fixit_crunch.conf b/release/alpha/fixit_crunch.conf
index 523e40a..08e5655 100644
--- a/release/alpha/fixit_crunch.conf
+++ b/release/alpha/fixit_crunch.conf
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: fixit_crunch.conf,v 1.1 1995/03/13 20:09:38 phk Exp $
 
 # first, we list the source dirs that our programs reside in.  These are
 # searched in order listed to find the dir containing each program.
@@ -21,7 +21,7 @@ ln sh -sh		# init invokes the shell this way
 
 # /sbin stuff
 
-progs badsect chown clri disklabel dump dmesg fdisk fsck ifconfig init
+progs bad144 badsect chown clri disklabel dump dmesg fdisk fsck ifconfig init
 progs mknod mount newfs ping reboot restore swapon umount
 ln dump rdump
 ln restore rrestore
diff --git a/release/fixit_crunch.conf b/release/fixit_crunch.conf
index 523e40a..08e5655 100644
--- a/release/fixit_crunch.conf
+++ b/release/fixit_crunch.conf
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: fixit_crunch.conf,v 1.1 1995/03/13 20:09:38 phk Exp $
 
 # first, we list the source dirs that our programs reside in.  These are
 # searched in order listed to find the dir containing each program.
@@ -21,7 +21,7 @@ ln sh -sh		# init invokes the shell this way
 
 # /sbin stuff
 
-progs badsect chown clri disklabel dump dmesg fdisk fsck ifconfig init
+progs bad144 badsect chown clri disklabel dump dmesg fdisk fsck ifconfig init
 progs mknod mount newfs ping reboot restore swapon umount
 ln dump rdump
 ln restore rrestore