1. Remove the scripts from the boot floppy - we don't need them anymore

and it saves us a fair bit of space.

2. Remove adduser and tzsetup as well - they're not needed.

3. Move ft from the boot floppy to the cpio floppy.

7 files changed, 13 insertions, 17 deletions

diff --git a/release/Makefile b/release/Makefile
index ca9e581..fcd2a7d 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.163 1995/05/21 10:33:20 jkh Exp $
+#	$Id: Makefile,v 1.164 1995/05/21 13:36:13 jkh Exp $
 #
 # How to roll a release:
 #
@@ -23,8 +23,6 @@ EXTRA_DISTS=	des ${EXPORT_DISTS}
 ALL_DISTS=	bin ${EXTRA_DISTS}
 
 CPIO1=	etc/services etc/protocols etc/sysconfig
-CPIO2=  scripts/miscfuncs.sh scripts/instdist.sh scripts/netinst.sh \
-	scripts/adduser.sh scripts/bininst.sh scripts/setup.sh
 
 FAQS=	README MIRROR.SITES
 
@@ -300,7 +298,6 @@ release.7:
 	@cd ${.CURDIR} ; $(MAKE) installCRUNCH CRUNCH=cpio \
 		DIR=${RD}/cpiofd/stand ZIP=false
 	cd ${RD}/trees/bin ; ls ${CPIO1} | cpio -dump ${RD}/cpiofd/stand
-	cd ${.CURDIR} ; ls ${CPIO2} | cpio -dumpv ${RD}/cpiofd/stand
 	( JUST_TELL_ME=please ; . ${.CURDIR}/../sys/conf/newvers.sh ; \
 	sed "/DISTNAME=/s/FOOBAR/$$DISTNAME/" \
 		< ${RD}/cpiofd/stand/scripts/miscfuncs.sh \
@@ -309,7 +306,6 @@ release.7:
 	mv ${RD}/cpiofd/stand/scripts/tmp \
 		${RD}/cpiofd/stand/scripts/miscfuncs.sh
 	chmod 755 ${RD}/cpiofd/stand/scripts/*
-	cp ${RD}/trees/bin/usr/sbin/tzsetup ${RD}/cpiofd/stand
 	( cd ${RD}/cpiofd ; \
 		( rm -f OK ; find . -print ; touch OK ; echo OK ) | \
 		cpio -H newc -oa | gzip -9 -c | dd conv=osync ) \
diff --git a/release/alpha/boot_crunch.conf b/release/alpha/boot_crunch.conf
index 6036588..bd5193e 100644
--- a/release/alpha/boot_crunch.conf
+++ b/release/alpha/boot_crunch.conf
@@ -1,10 +1,10 @@
-#	$Id: boot_crunch.conf,v 1.9 1995/05/19 21:31:52 jkh Exp $
+#	$Id: boot_crunch.conf,v 1.10 1995/05/21 13:54:02 jkh Exp $
 
 srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
 srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin
 
 progs ls sh find
-progs sysinstall newfs gzip cpio fsck dialog bad144 fsck ft
+progs sysinstall newfs gzip cpio fsck dialog bad144 fsck
 ln gzip gunzip
 ln gzip zcat
 ln sh -sh
diff --git a/release/amd64/boot_crunch.conf b/release/amd64/boot_crunch.conf
index 6036588..bd5193e 100644
--- a/release/amd64/boot_crunch.conf
+++ b/release/amd64/boot_crunch.conf
@@ -1,10 +1,10 @@
-#	$Id: boot_crunch.conf,v 1.9 1995/05/19 21:31:52 jkh Exp $
+#	$Id: boot_crunch.conf,v 1.10 1995/05/21 13:54:02 jkh Exp $
 
 srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
 srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin
 
 progs ls sh find
-progs sysinstall newfs gzip cpio fsck dialog bad144 fsck ft
+progs sysinstall newfs gzip cpio fsck dialog bad144 fsck
 ln gzip gunzip
 ln gzip zcat
 ln sh -sh
diff --git a/release/boot_crunch.conf b/release/boot_crunch.conf
index 6036588..bd5193e 100644
--- a/release/boot_crunch.conf
+++ b/release/boot_crunch.conf
@@ -1,10 +1,10 @@
-#	$Id: boot_crunch.conf,v 1.9 1995/05/19 21:31:52 jkh Exp $
+#	$Id: boot_crunch.conf,v 1.10 1995/05/21 13:54:02 jkh Exp $
 
 srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
 srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin
 
 progs ls sh find
-progs sysinstall newfs gzip cpio fsck dialog bad144 fsck ft
+progs sysinstall newfs gzip cpio fsck dialog bad144 fsck
 ln gzip gunzip
 ln gzip zcat
 ln sh -sh
diff --git a/release/cpio_crunch.conf b/release/cpio_crunch.conf
index e5c399f..46827be 100644
--- a/release/cpio_crunch.conf
+++ b/release/cpio_crunch.conf
@@ -1,4 +1,4 @@
-# $Id: cpio_crunch.conf,v 1.4 1995/05/10 17:20:23 jkh Exp $
+# $Id: cpio_crunch.conf,v 1.5 1995/05/18 13:54:12 jkh 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.
@@ -14,7 +14,7 @@ srcdirs /usr/src/usr.sbin
 # /bin stuff
 
 progs cat chmod cksum cp date dd df echo ed expr grep hostname kill ln ls
-progs mkdir mt mv pwd rcp rm rmdir sh sleep slattach stty sync test
+progs mkdir mt mv pwd rcp rm rmdir sh sleep slattach stty sync test ft
 ln test [
 ln sh -sh		# init invokes the shell this way
 
diff --git a/release/i386/boot_crunch.conf b/release/i386/boot_crunch.conf
index 6036588..bd5193e 100644
--- a/release/i386/boot_crunch.conf
+++ b/release/i386/boot_crunch.conf
@@ -1,10 +1,10 @@
-#	$Id: boot_crunch.conf,v 1.9 1995/05/19 21:31:52 jkh Exp $
+#	$Id: boot_crunch.conf,v 1.10 1995/05/21 13:54:02 jkh Exp $
 
 srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
 srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin
 
 progs ls sh find
-progs sysinstall newfs gzip cpio fsck dialog bad144 fsck ft
+progs sysinstall newfs gzip cpio fsck dialog bad144 fsck
 ln gzip gunzip
 ln gzip zcat
 ln sh -sh
diff --git a/release/pc98/boot_crunch.conf b/release/pc98/boot_crunch.conf
index 6036588..bd5193e 100644
--- a/release/pc98/boot_crunch.conf
+++ b/release/pc98/boot_crunch.conf
@@ -1,10 +1,10 @@
-#	$Id: boot_crunch.conf,v 1.9 1995/05/19 21:31:52 jkh Exp $
+#	$Id: boot_crunch.conf,v 1.10 1995/05/21 13:54:02 jkh Exp $
 
 srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
 srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin
 
 progs ls sh find
-progs sysinstall newfs gzip cpio fsck dialog bad144 fsck ft
+progs sysinstall newfs gzip cpio fsck dialog bad144 fsck
 ln gzip gunzip
 ln gzip zcat
 ln sh -sh