kill a few more things

3 files changed, 4 insertions, 76 deletions

diff --git a/distrib/hp300/ramdisk/dot.profile b/distrib/hp300/ramdisk/dot.profile
deleted file mode 100644
index b0e7e0e2957..00000000000
--- a/distrib/hp300/ramdisk/dot.profile
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-#	$OpenBSD: dot.profile,v 1.14 2002/04/21 17:09:28 deraadt Exp $
-#	$NetBSD: dot.profile,v 1.1 1995/07/18 04:13:09 briggs Exp $
-#
-# Copyright (c) 1994 Christopher G. Demetriou
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#	This product includes software developed by Christopher G. Demetriou.
-# 4. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-export PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
-export TERM=hp300h
-umask 022
-set -o emacs # emacs-style command line editing
-
-if [ "X${DONEPROFILE}" = "X" ]; then
-	DONEPROFILE=YES
-	export DONEPROFILE
-
-	# set up some sane defaults
-	echo 'erase ^?, werase ^W, kill ^U, intr ^C, status ^T'
-	stty newcrt werase ^W intr ^C kill ^U erase ^? status ^T 9600
-
-	mount -u /dev/rd0a /
-
-	# Installing or upgrading?
-	_forceloop=""
-	while [ "X$_forceloop" = X"" ]; do
-		echo -n '(I)nstall, (U)pgrade, or (S)hell? '
-		read _forceloop
-		case "$_forceloop" in
-		i*|I*)	/install
-			;;
-		u*|U*)	/upgrade
-			;;
-		s*|S*)	;;
-		*)	_forceloop=""
-			;;
-		esac
-	done
-fi
diff --git a/distrib/hp300/ramdisk/list b/distrib/hp300/ramdisk/list
index 5513698e6d0..9c8dceb119e 100644
--- a/distrib/hp300/ramdisk/list
+++ b/distrib/hp300/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.27 2002/02/09 17:02:13 deraadt Exp $
+#	$OpenBSD: list,v 1.28 2002/04/22 02:40:30 deraadt Exp $
 
 COPY	${OBJDIR}/raminst		raminst
 LINK	raminst				bin/cat
@@ -45,7 +45,6 @@ LINK	raminst				usr/bin/sed
 LINK	raminst				usr/bin/sort
 LINK	raminst				bin/pax
 LINK	raminst				usr/bin/tar
-LINK	raminst				usr/bin/vi
 LINK	raminst				sbin/dhclient
 SPECIAL	/bin/rm raminst
 
@@ -69,15 +68,10 @@ COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
 COPY	${CURDIR}/../../miniroot/services	etc/services
 SPECIAL	sed -e '/^#[ 	].*$/d' < ${DESTDIR}/etc/disktab > etc/disktab
 
-# we strip comments from files since we need the space...
-
-# and the common installation tools
-SPECIAL	sed -e '/^#[ 	].*$/d' < ${TOPDIR}/common/dot.commonutils > .commonutils
 SPECIAL	sed -e '/^#[ 	].*$/d' < ${TOPDIR}/common/termcap.hp-vt > usr/share/misc/termcap
 
 # and the installation tools
-SPECIAL	sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/dot.profile > .profile
-SPECIAL	sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/dot.instutils > .instutils
+SPECIAL	sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../../miniroot/dot.profile > .profile
 SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" -e '/^[ 	]*#$/d' < ${CURDIR}/install.md > install.md
 SPECIAL	sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../../miniroot/install.sh > install
 SPECIAL	sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade
diff --git a/distrib/hp300/ramdisk/raminst.conf b/distrib/hp300/ramdisk/raminst.conf
index a7f272b9dd1..3a4e71431da 100644
--- a/distrib/hp300/ramdisk/raminst.conf
+++ b/distrib/hp300/ramdisk/raminst.conf
@@ -1,16 +1,15 @@
 #
-#	$OpenBSD: raminst.conf,v 1.16 2001/10/20 01:40:28 millert Exp $
+#	$OpenBSD: raminst.conf,v 1.17 2002/04/22 02:40:30 deraadt Exp $
 #
 # raminst.conf - unified binary for the RAM disk
 #
 
 srcdirs distrib/special bin sbin usr.bin/less gnu/usr.bin usr.bin usr.sbin
-srcdirs usr.bin/vi
 
 progs cat chmod cp dd df disklabel dhclient dmesg ed expr
 progs fsck_ffs ftp hostname grep gzip ifconfig init less ln ls
 progs mkdir mknod mount mount_cd9660 mount_ffs mount_nfs
-progs mv newfs pax ksh ping reboot rm route build
+progs mv newfs pax ksh ping reboot rm route
 progs sed sleep sort stty sync umount restore
 
 ln pax tar
@@ -24,6 +23,5 @@ ln newfs mount_mfs
 ln grep egrep
 ln reboot halt
 ln less more
-ln build vi
 
 libs -ledit -lutil -lcurses -lcompat -lpcap -ll -lm