keep more up to date..

fixit uses the same crunch.conf as normal generation
upgrade boot floppy to 1.44MB so that it fits

3 files changed, 13 insertions, 17 deletions

diff --git a/release/floppies/boot/crunch/crunch.conf b/release/floppies/boot/crunch/crunch.conf
index 01d7595b0616..e1297385219a 100644
--- a/release/floppies/boot/crunch/crunch.conf
+++ b/release/floppies/boot/crunch/crunch.conf
@@ -1,4 +1,4 @@
-#	$Id: crunch.conf,v 1.4 1997/07/16 12:24:23 julian Exp $
+#	$Id: crunch.conf,v 1.4 1997/07/22 02:51:00 julian Exp $
 
 srcdirs /usr/src/bin
 srcdirs /usr/src/release
@@ -16,8 +16,6 @@ ln gzip gunzip
 ln gzip zcat
 ln sh -sh
 
-libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio
+libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lalias -lz
 libs -ldialog -lncurses -lmytinfo -L/usr/src/release/libdisk/obj -ldisk -lipx
-#libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lalias
-#libs -ldialog -lncurses -lmytinfo -L/usr/src/release/libdisk/obj -ldisk -lipx
 
diff --git a/release/floppies/boot/floppy/Makefile b/release/floppies/boot/floppy/Makefile
index 34d30b29ee6d..b42c8203c448 100644
--- a/release/floppies/boot/floppy/Makefile
+++ b/release/floppies/boot/floppy/Makefile
@@ -1,5 +1,5 @@
 
-#	$Id: Makefile,v 1.6 1997/07/16 12:24:23 julian Exp $
+#	$Id: Makefile,v 1.6 1997/07/22 02:51:00 julian Exp $
 # If this is a RELEASE, then set
 
 # Things which without too much trouble can be considered variables
@@ -13,8 +13,8 @@ SCRIPTDIR=${.CURDIR}/../../bin
 MNT=			/mnt
 
 # other floppy parameters.
-FSSIZE=			1200
-FSLABEL=		fd1200
+FSSIZE=			1440
+FSLABEL=		fd1440
 FSINODE=		4300
 
 NEWFSARGS=		-c 80 -b 4096 -f 512 -i 4000 -m 0 -t 0 -u 0 \
diff --git a/release/floppies/fixit/crunch/crunch.conf b/release/floppies/fixit/crunch/crunch.conf
index 8938ab731f96..a2365474b025 100644
--- a/release/floppies/fixit/crunch/crunch.conf
+++ b/release/floppies/fixit/crunch/crunch.conf
@@ -1,15 +1,11 @@
-# $Id: crunch.conf,v 1.4 1997/07/16 12:24:26 julian Exp $
+# $Id: fixit_crunch.conf,v 1.14 1997/12/25 23:08:44 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.
 
-srcdirs /usr/src/bin
+srcdirs /usr/src/bin /usr/src/sbin /usr/src/usr.bin /usr/src/usr.sbin
+srcdirs /usr/src/gnu/usr.bin /usr/src/usr.bin/vi
 srcdirs /usr/src/sbin/i386
-srcdirs /usr/src/sbin
-srcdirs /usr/src/gnu/usr.bin
-srcdirs /usr/src/usr.bin
-srcdirs /usr/src/usr.sbin
-srcdirs /usr/src/usr.bin/vi
 
 # second, we list all the programs we want to include in our crunched binary.
 # The order doesn't matter.  Any program that needs hard links to it gets an
@@ -28,6 +24,7 @@ progs badsect chown clri disklabel dump dmesg fdisk ft
 progs mknod mount newfs ping reboot restore scsi swapon umount
 
 progs mount_msdos mount_cd9660 mount_nfs
+
 ln dump rdump
 ln restore rrestore
 ln newfs mount_mfs
@@ -35,11 +32,12 @@ ln chown chgrp
 
 # /usr/bin stuff
 
-progs ftp rsh sed telnet rlogin vi find grep
+progs ftp more rsh sed telnet rlogin vi find grep
 ln vi view
 ln vi ex
 
 # finally, we specify the libraries to link in with our binary
 
-libs -lcrypt -ltelnet -lutil -ll -ltcl -lm
-libs -lcurses -ltermcap -ledit -lgnuregex -lkvm -lscsi
+libs -lcrypt -ltelnet -lutil -ll -lm
+libs -lcurses -ltermcap -ledit -lgnuregex -lkvm -lscsi -lz
+