Synch this with i386 version again. This fits nicely on alphas.

Reviewed by:	beast

1 files changed, 14 insertions, 29 deletions

diff --git a/release/fixit_crunch.conf b/release/fixit_crunch.conf
index a86577d..33cd155 100644
--- a/release/fixit_crunch.conf
+++ b/release/fixit_crunch.conf
@@ -2,38 +2,23 @@
 
 buildopts -DRELEASE_CRUNCH
 
-# 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 /usr/src/sbin /usr/src/usr.bin /usr/src/usr.sbin
-srcdirs /usr/src/gnu/usr.bin /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
-# `ln' directive.  
-
-# /bin stuff
-
-progs cat chmod chroot cp dd df echo expr kill ln ls mkdir
-progs mv rm rmdir sleep sync
-
-# /sbin stuff
-
-progs chown dmesg
-progs mknod mount reboot restore swapon umount
-
-progs mount_cd9660
-
+srcdirs /usr/src/bin
+progs cat chmod cp dd df echo expr kill
+progs ln ls mkdir mv rm rmdir sleep sync
+
+srcdirs /usr/src/sbin
+progs clri disklabel dmesg mknod
+progs mount mount_cd9660 mount_msdos
+progs reboot restore swapon umount
 ln restore rrestore
-ln chown chgrp
 
-# /usr/bin stuff
-
-progs ftp vi
+srcdirs /usr/src/usr.bin
+progs ftp telnet vi
 ln vi view
 ln vi ex
 
-# finally, we specify the libraries to link in with our binary
+srcdirs /usr/src/usr.sbin
+progs chown chroot
+ln chown chgrp
 
-libs -lcrypt -lutil -ll -lm
-libs -lcurses -ltermcap -ledit -lkvm -lz
+libs -lutil -lm -lncurses -ltermcap -ledit -lkvm