delete things until it fits.... sigh

4 files changed, 49 insertions, 26 deletions

diff --git a/distrib/sparc/floppies/inst-common/instbin-krb.conf b/distrib/sparc/floppies/inst-common/instbin-krb.conf
new file mode 100644
index 00000000000..f4f654dd5b6
--- /dev/null
+++ b/distrib/sparc/floppies/inst-common/instbin-krb.conf
@@ -0,0 +1,25 @@
+#
+# kcbin.conf - unified binary for the kc floppy
+# $Id: instbin-krb.conf,v 1.1 1997/02/09 16:50:51 deraadt Exp $	
+#
+
+srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
+
+progs awk cat chmod chown cp dd df disklabel ed expr fsck_ffs
+progs ftp
+progs ifconfig init less ln ls mkdir mknod mount mount_cd9660
+progs mount_ffs mount_nfs mount_kernfs
+progs mv newfs pax pdksh ping pwd reboot rm route
+progs sed strings stty sync test umount
+progs gzip
+
+ln chown chgrp
+ln fsck_ffs fsck
+ln less more
+ln pax tar
+ln pdksh sh
+ln pdksh -sh		# init invokes the shell this way
+ln test [
+ln reboot halt
+
+libs -ledit -lutil -ltermcap -lkrb -ldes -ll -lm
diff --git a/distrib/sparc/floppies/inst-common/instbin.conf b/distrib/sparc/floppies/inst-common/instbin.conf
index 50511994108..2ad6023abd2 100644
--- a/distrib/sparc/floppies/inst-common/instbin.conf
+++ b/distrib/sparc/floppies/inst-common/instbin.conf
@@ -1,27 +1,25 @@
 #
 # kcbin.conf - unified binary for the kc floppy
-# $Id: instbin.conf,v 1.8 1997/02/06 22:43:17 deraadt Exp $	
+# $Id: instbin.conf,v 1.9 1997/02/09 16:50:52 deraadt Exp $	
 #
 
-srcdirs bin sbin usr.bin usr.sbin gnu/usr.bin
+srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
 
-progs bad144 cat chmod chown chroot cp dd df disklabel ed expr fsck_ffs
-progs ftp awk gzip
-progs ifconfig init ln ls mkdir mknod less mount mount_cd9660
-progs mount_ffs mount_msdos mount_nfs mv newfs pax pdksh ping
-progs pwd reboot rm route progs sed shutdown slattach stty
-progs sync test umount
+progs awk cat chmod chown cp dd df disklabel ed expr fsck_ffs
+progs ftp
+progs ifconfig init less ln ls mkdir mknod mount mount_cd9660
+progs mount_ffs mount_nfs mount_kernfs
+progs mv newfs pax pdksh ping pwd reboot rm route
+progs sed strings stty sync test umount
+progs rsh gzip
 
 ln chown chgrp
+ln fsck_ffs fsck
+ln less more
 ln pax tar
 ln pdksh sh
 ln pdksh -sh		# init invokes the shell this way
 ln test [
-ln mount_cd9660 cd9660
-ln fsck_ffs fsck
-ln mount_ffs ffs
-ln mount_msdos msdos
-ln mount_nfs nfs
 ln reboot halt
 
-libs -ledit -lutil -ltermcap -lcrypt -ll -lz -lm
+libs -ledit -lutil -ltermcap -ll -lm
diff --git a/distrib/sparc/floppies/inst-common/list b/distrib/sparc/floppies/inst-common/list
index aec1f92249d..3344f7f919d 100644
--- a/distrib/sparc/floppies/inst-common/list
+++ b/distrib/sparc/floppies/inst-common/list
@@ -1,4 +1,4 @@
-#	$Id: list,v 1.6 1996/10/10 10:10:33 deraadt Exp $
+#	$Id: list,v 1.7 1997/02/09 16:50:53 deraadt Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin	instbin
@@ -31,14 +31,14 @@ LINK	instbin			sbin/mknod
 LINK	instbin			sbin/mount
 LINK	instbin			sbin/mount_cd9660
 LINK	instbin			sbin/mount_ffs
-LINK	instbin			sbin/mount_msdos
+#LINK	instbin			sbin/mount_msdos
 LINK	instbin			sbin/mount_nfs
 LINK	instbin			sbin/newfs
 LINK	instbin			sbin/ping
 LINK	instbin			sbin/reboot
 LINK	instbin			sbin/route
-LINK	instbin			sbin/shutdown
-LINK	instbin			sbin/slattach
+#LINK	instbin			sbin/shutdown
+#LINK	instbin			sbin/slattach
 LINK	instbin			sbin/umount
 SYMLINK	/bin/cat		usr/bin/awk
 SYMLINK	/bin/cat		usr/bin/chgrp
@@ -48,7 +48,7 @@ SYMLINK	/bin/cat		usr/bin/gzip
 SYMLINK	/bin/cat		usr/bin/more
 SYMLINK	/bin/cat		usr/bin/sed
 SYMLINK	/bin/cat		usr/bin/strings
-SYMLINK	/bin/cat		usr/bin/tip
+#SYMLINK /bin/cat		usr/bin/tip
 #SYMLINK /bin/cat		usr/sbin/bad144
 SYMLINK	/bin/cat		usr/sbin/chown
 SYMLINK	/bin/cat		usr/sbin/chroot
@@ -56,7 +56,7 @@ SPECIAL	/bin/rm instbin
 SPECIAL sync
 
 # copy the MAKEDEV script and make some devices
-#COPY	${DESTDIR}/dev/MAKEDEV	dev/MAKEDEV
+COPY	${DESTDIR}/dev/MAKEDEV	dev/MAKEDEV
 SPECIAL	cd dev; sh ${DESTDIR}/dev/MAKEDEV std fd0
 #SPECIAL	/bin/rm dev/MAKEDEV
 
@@ -67,12 +67,12 @@ SPECIAL	cd dev; sh ${DESTDIR}/dev/MAKEDEV std fd0
 
 # various files that we need in /etc for the install
 COPY	${DESTDIR}/etc/group		etc/group
-COPY	${DESTDIR}/etc/master.passwd	etc/master.passwd
-COPY	${DESTDIR}/etc/passwd		etc/passwd
+#COPY	${DESTDIR}/etc/master.passwd	etc/master.passwd
+#COPY	${DESTDIR}/etc/passwd		etc/passwd
 COPY	${DESTDIR}/etc/protocols	etc/protocols
-COPY	${DESTDIR}/etc/pwd.db		etc/pwd.db
+#COPY	${DESTDIR}/etc/pwd.db		etc/pwd.db
 COPY	${DESTDIR}/etc/services		etc/services
-COPY	${DESTDIR}/etc/spwd.db		etc/spwd.db
+#COPY	${DESTDIR}/etc/spwd.db		etc/spwd.db
 
 # and the common installation tools
 COPY	${TOPDIR}/inst-common/dot.commonutils	.commonutils
diff --git a/distrib/sparc/floppies/inst-common/mtree.conf b/distrib/sparc/floppies/inst-common/mtree.conf
index 5e5ddf133ef..c89f7152740 100644
--- a/distrib/sparc/floppies/inst-common/mtree.conf
+++ b/distrib/sparc/floppies/inst-common/mtree.conf
@@ -1,4 +1,4 @@
-#	$Id: mtree.conf,v 1.1 1995/10/27 22:39:59 deraadt Exp $
+#	$Id: mtree.conf,v 1.2 1997/02/09 16:50:54 deraadt Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -25,7 +25,7 @@ mnt
 ..
 
 # ./mnt2
-mnt2
+#mnt2
 # ./mnt2
 ..