minor cleanups, i think

4 files changed, 14 insertions, 37 deletions

diff --git a/distrib/mvme88k/miniroot/list b/distrib/mvme88k/miniroot/list
index f79d28c181b..5278d7df380 100644
--- a/distrib/mvme88k/miniroot/list
+++ b/distrib/mvme88k/miniroot/list
@@ -1,18 +1,13 @@
-#	$OpenBSD: list,v 1.6 2001/10/08 19:26:14 deraadt Exp $
+#	$OpenBSD: list,v 1.7 2002/04/21 17:14:17 deraadt Exp $
 #	$NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
 
 # Amiga extra's
 LINK	instbin			sbin/disklabel
 LINK	instbin			sbin/mount_msdos
-
-SYMLINK	../../instbin		usr/bin/basename
-SYMLINK ../../instbin		usr/bin/cksum usr/bin/sum
-SYMLINK ../../instbin		usr/bin/grep usr/bin/egrep usr/bin/fgrep
-SYMLINK ../../instbin		usr/bin/netstat
-SYMLINK ../../instbin		usr/bin/rsh
-SYMLINK ../../instbin		usr/bin/tset usr/bin/reset
-SYMLINK	../../instbin		usr/bin/less usr/bin/more
-SYMLINK	../../instbin		usr/sbin/sysctl
+LINK	instbin			usr/bin/cksum usr/bin/sum
+LINK	instbin			usr/bin/grep usr/bin/egrep usr/bin/fgrep
+LINK	instbin			usr/bin/tset usr/bin/reset
+LINK	instbin			usr/bin/less usr/bin/more
 
 # Minimize use of MFS
 SYMLINK	/tmp	var/tmp
diff --git a/distrib/mvme88k/ramdisk/list b/distrib/mvme88k/ramdisk/list
index 17714f5b93a..79c5147f5c5 100644
--- a/distrib/mvme88k/ramdisk/list
+++ b/distrib/mvme88k/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.10 2002/02/09 17:02:14 deraadt Exp $
+#	$OpenBSD: list,v 1.11 2002/04/21 17:14:17 deraadt Exp $
 
 COPY	${OBJDIR}/raminst		raminst
 LINK	raminst			bin/cat
@@ -41,10 +41,7 @@ LINK	raminst			sbin/mount_mfs
 LINK	raminst			sbin/newfs
 LINK	raminst			sbin/reboot
 LINK	raminst			sbin/route
-LINK	raminst			sbin/slattach
 LINK	raminst			sbin/umount
-LINK	raminst			usr/bin/awk
-LINK	raminst			usr/bin/cut
 LINK	raminst			usr/bin/ftp
 LINK	raminst			usr/bin/egrep
 LINK	raminst			usr/bin/grep
@@ -52,18 +49,18 @@ LINK	raminst			usr/bin/gzip
 LINK	raminst			usr/bin/more
 LINK	raminst			usr/bin/less
 LINK	raminst			usr/bin/sed
-LINK	raminst			usr/bin/sort
 LINK	raminst			usr/bin/tar
 LINK	raminst			usr/bin/pax
-LINK	raminst			usr/bin/tip
 SPECIAL	/bin/rm raminst
 
 # copy the MAKEDEV script and make some devices
-COPY	${DESTDIR}/dev/MAKEDEV	dev/MAKEDEV
+SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${DESTDIR}/dev/MAKEDEV	 > dev/MAKEDEV
 SPECIAL	cd dev; sh MAKEDEV ramdisk
 
-# we need the contents of /usr/mdec (XXX)
-# COPY	${DESTDIR}/usr/mdec/*	usr/mdec
+# mdec
+COPY    ${DESTDIR}/usr/mdec/installboot usr/mdec
+COPY    ${DESTDIR}/usr/mdec/bootxx 	usr/mdec
+COPY    ${DESTDIR}/usr/mdec/bootsd 	usr/mdec
 
 # various files that we need in /etc for the install
 COPY	${DESTDIR}/etc/group		etc
@@ -75,22 +72,16 @@ COPY	${DESTDIR}/etc/services		etc
 COPY	${DESTDIR}/etc/spwd.db		etc
 
 # and the common installation tools
-COPY	${TOPDIR}/common/dot.commonutils	.commonutils
 COPY	${TOPDIR}/common/termcap.vt	usr/share/misc/termcap
 
 # the disktab explanation file
 COPY	disktab.preinstall		etc
 
 # and the installation tools
-LINK    sbin/init                 	usr/bin/vi
 COPY	dot.profile			.profile
-COPY	dot.instutils			.instutils
 COPY	install.sh			install
 SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${CURDIR}/install.md > install.md
 COPY	install.sub			install.sub
 COPY	disktab.shadow			etc/disktab.shadow
-COPY    ${DESTDIR}/usr/mdec/installboot usr/mdec
-COPY    ${DESTDIR}/usr/mdec/bootxx 	usr/mdec
-COPY    ${DESTDIR}/usr/mdec/bootsd 	usr/mdec
 
 SPECIAL	chmod 755 install
diff --git a/distrib/mvmeppc/ramdisk/instbin.conf b/distrib/mvmeppc/ramdisk/instbin.conf
index 83209b82d9c..eea65567d12 100644
--- a/distrib/mvmeppc/ramdisk/instbin.conf
+++ b/distrib/mvmeppc/ramdisk/instbin.conf
@@ -1,4 +1,4 @@
-#       $OpenBSD: instbin.conf,v 1.4 2002/02/14 03:40:13 deraadt Exp $
+#       $OpenBSD: instbin.conf,v 1.5 2002/04/21 17:14:17 deraadt Exp $
 #
 # instbin.conf - unified binary for the inst/upgr floppies
 #
@@ -9,7 +9,7 @@ srcdirs gnu/usr.bin usr.bin bin sbin usr.sbin
 progs dd mount_cd9660 df dhclient mount sync restore newfs_msdos
 progs stty ln disklabel pax ping cat ifconfig ls
 progs less mount_nfs pdisk fdisk grep umount mount_msdos rsh fsck
-progs scsi mknod route ftp mount_ffs reboot ed
+progs mknod route ftp mount_ffs reboot ed
 progs cp gzip chmod fsck_ffs sort init newfs
 progs tip rm mt mkdir sed ksh sleep
 progs mv expr test hostname
diff --git a/distrib/mvmeppc/ramdisk/list b/distrib/mvmeppc/ramdisk/list
index b1c14b18853..4621905b3df 100644
--- a/distrib/mvmeppc/ramdisk/list
+++ b/distrib/mvmeppc/ramdisk/list
@@ -1,8 +1,7 @@
-#	$OpenBSD: list,v 1.5 2002/02/14 03:40:13 deraadt Exp $
+#	$OpenBSD: list,v 1.6 2002/04/21 17:14:17 deraadt Exp $
 
 SRCDIRS distrib/special
 SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin
-#SRCDIRS usr.bin/vi
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin	instbin
@@ -48,19 +47,12 @@ LINK	instbin			sbin/newfs_msdos
 LINK	instbin			sbin/ping
 LINK	instbin			sbin/restore
 LINK	instbin			sbin/route
-#LINK	instbin			sbin/slattach
-LINK	instbin			sbin/scsi
 LINK	instbin			sbin/umount
 LINK	instbin			usr/bin/grep usr/bin/fgrep usr/bin/egrep
 LINK	instbin			usr/bin/ftp
 LINK	instbin			usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
 LINK	instbin			usr/bin/less usr/bin/more
-LINK	instbin			usr/bin/rsh
 LINK	instbin			usr/bin/sed
-LINK	instbin			usr/bin/sort
-LINK	instbin			usr/bin/tip
-LINK	instbin			usr/sbin/chat
-#SYMLINK ../../instbin           usr/bin/build usr/bin/vi
 
 # copy the MAKEDEV script and make some devices
 COPY	${DESTDIR}/dev/MAKEDEV	dev/MAKEDEV
@@ -88,7 +80,6 @@ COPY    ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
 
 # and the common installation tools
 COPY    ${TOPDIR}/common/termcap.vt        usr/share/misc/termcap
-#COPY	${DESTDIR}/usr/share/misc/scsi_modes	usr/share/misc/scsi_modes
 
 # and the installation tools
 COPY	dot.profile			.profile