remove old stuff

28 files changed, 1 insertions, 2216 deletions

diff --git a/distrib/sparc/Makefile b/distrib/sparc/Makefile
index 10128c4a2e3..3b9e6293ad9 100644
--- a/distrib/sparc/Makefile
+++ b/distrib/sparc/Makefile
@@ -1,8 +1,5 @@
-#	$OpenBSD: Makefile,v 1.4 1998/12/15 00:40:29 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.5 2000/04/24 20:23:28 deraadt Exp $
 
-# at this point only the floppies directory has object, ramdisk and
-# miniroot are just architeture dependent inclusions for ../ramdisk, etc.
-#SUBDIR=	floppies
 SUBDIR+= ../ramdisk ../miniroot
 
 .include <bsd.subdir.mk>
diff --git a/distrib/sparc/floppies/Makefile b/distrib/sparc/floppies/Makefile
deleted file mode 100644
index 28de8b45217..00000000000
--- a/distrib/sparc/floppies/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#	$OpenBSD: Makefile,v 1.3 1997/05/01 11:30:45 niklas Exp $
-
-SUBDIR= kernel inst upgr
-
-unconfig:
-	cd kernel; ${MAKE} unconfig
-
-.include <bsd.subdir.mk>
diff --git a/distrib/sparc/floppies/Makefile.inc b/distrib/sparc/floppies/Makefile.inc
deleted file mode 100644
index 7ef83e82ea8..00000000000
--- a/distrib/sparc/floppies/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.8 1998/06/27 20:52:14 todd Exp $
-
-REV=	${OSrev}
-
-.include <bsd.own.mk>
diff --git a/distrib/sparc/floppies/inst-common/Makefile.inc b/distrib/sparc/floppies/inst-common/Makefile.inc
deleted file mode 100644
index 22f83cd8dbf..00000000000
--- a/distrib/sparc/floppies/inst-common/Makefile.inc
+++ /dev/null
@@ -1,63 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.11 1997/09/26 01:51:29 millert Exp $
-
-# TOP is assumed to be defined by Makefile including this one.
-
-CBIN=		instbin
-COMMONDIR=	${TOP}/inst-common
-
-MOUNT_POINT?=	/mnt
-VND?=		svnd0
-VND_DEV=	/dev/${VND}a
-VND_RDEV=	/dev/r${VND}a
-PID!=		echo $$$$
-REALIMAGE!=	echo /var/tmp/image.${PID}
-IMAGE?=		inst${REV}.fs
-MDEC=		${DESTDIR}/usr/mdec
-
-LISTS=		${COMMONDIR}/list ${.CURDIR}/list
-.if (${KERBEROS} == "yes")
-CRUNCHCONF=	${COMMONDIR}/${CBIN}-krb.conf
-.else
-CRUNCHCONF=	${COMMONDIR}/${CBIN}.conf
-.endif
-MTREE=		${COMMONDIR}/mtree.conf
-
-all: ${CBIN}
-	dd if=/dev/zero of=${REALIMAGE} bs=120k count=12
-	vnconfig -v -c ${VND} ${REALIMAGE}
-	disklabel -w ${VND} floppy3
-	newfs -O -m 0 -o space -i 8192 -c 80 ${VND_RDEV}
-	mount ${VND_DEV} ${MOUNT_POINT}
-	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
-	df -i ${MOUNT_POINT}
-	umount ${MOUNT_POINT}
-	vnconfig -u ${VND}
-	cp ${REALIMAGE} ${IMAGE}
-	rm ${REALIMAGE}
-
-unconfig:
-	-umount -f ${MOUNT_POINT}
-	-vnconfig -u ${VND}
-	-/bin/rm -f ${IMAGE}
-
-${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
-	crunchgen -D ${TOP}/../../.. -m ${CBIN}.mk -L ${DESTDIR}/usr/lib \
-	    ${CRUNCHCONF}
-
-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
-	make -f ${CBIN}.mk all
-.if (${KERBEROS} == "yes")
-	mv ${CBIN}-krb ${CBIN}
-.endif
-
-clean cleandir:
-	/bin/rm -f ${IMAGE} ${CBIN} ${CBIN}-krb.mk ${CBIN}-krb.cache \
-	    ${CBIN}.mk ${CBIN}.cache *.o *.lo *.c
-
-beforeinstall:
-	cp ${IMAGE} ${DESTDIR}/snapshot
-
-.include <bsd.obj.mk>
-.include <bsd.subdir.mk>
diff --git a/distrib/sparc/floppies/inst-common/dot.commonutils b/distrib/sparc/floppies/inst-common/dot.commonutils
deleted file mode 100644
index efe4fe919ed..00000000000
--- a/distrib/sparc/floppies/inst-common/dot.commonutils
+++ /dev/null
@@ -1,131 +0,0 @@
-#	$OpenBSD: dot.commonutils,v 1.5 1996/12/09 07:05:19 deraadt 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.
-
-# Installation utilites (functions), to get OpenBSD installed on
-# the hard disk.  These are meant to be invoked from the shell prompt,
-# by people installing OpenBSD.
-
-# we know that /etc/fstab is only generated on the hard drive
-dest_dir=/
-if [ ! -f /etc/fstab ]; then
-	dest_dir=/mnt/
-fi
-
-# counter for possible shared library confusion
-TAR=/bin/tar
-GUNZIP="/usr/bin/gzip -d"
-
-Set_tmp_dir()
-{
-	def_tmp_dir=`pwd`
-	if [ "$def_tmp_dir" = "/" -o "$def_tmp_dir" = "/mnt" ]; then
-		def_tmp_dir="$dest_dir"usr/distrib
-	fi
-
-	echo -n	"What directory should be used to find and/or store "
-	echo	"installtion"
-	echo -n	"files? [$def_tmp_dir] "
-	read tmp_dir
-	if [ "$tmp_dir" = "" ]; then
-		tmp_dir=$def_tmp_dir
-	fi
-	if [ ! -d "$tmp_dir" ]; then
-		/bin/rm -rf $tmp_dir
-		mkdir -p $tmp_dir
-	fi
-}
-
-Tmp_dir()
-{
-	if [ "$tmp_dir" = "" ]; then
-		Set_tmp_dir
-	fi
-	cd $tmp_dir
-}
-
-Load_fd()
-{
-	Tmp_dir
-	which=
-	echo "Don't forget that you can't load from the drive you booted from."
-	echo ""
-
-	while [ "$which" != "0" -a "$which" != "1" ]; do
-		echo -n	"Read from which floppy drive ('0' or '1')? [1] "
-		read which
-		if [ "X$which" = "X" ]; then
-			which=1
-		fi
-	done
-	echo	""
-	echo	"WARNING: during the floppy loading process, you should only"
-	echo	"use Control-C at the prompt."
-	echo	""
-	while echo -n \
-	    "Insert floppy (hit Control-C to terminate, enter to load): "
-	do
-		read foo
-		mount -r -t msdos /dev/fd${which}a /mnt2
-		cp -rp /mnt2/* .
-		umount /mnt2
-	done
-}
-
-Load_tape()
-{
-	Tmp_dir
-	echo -n	"Which tape drive will you be using? [rst0] "
-	read which
-	if [ "X$which" = "X" ]; then
-		which=rst0
-	fi
-	echo -n "Insert the tape into the tape drive and hit return to "
-	echo -n "continue..."
-	read foo
-	echo	"Extracting files from the tape..."
-	$TAR xvpf /dev/$which
-	echo	"Done."
-}
-
-Extract()
-{
-	Tmp_dir
-	echo -n "Would you like to list the files as they're extracted? [n] "
-	read verbose
-	case $verbose in
-	y*|Y*)
-		tarverbose=v
-		;;
-	*)
-		tarverbose=
-		;;
-	esac
-	cat "$1"* | $GUNZIP | (cd $dest_dir ; $TAR -xp"$tarverbose"f - )
-}
diff --git a/distrib/sparc/floppies/inst-common/instbin-krb.conf b/distrib/sparc/floppies/inst-common/instbin-krb.conf
deleted file mode 100644
index be42d906494..00000000000
--- a/distrib/sparc/floppies/inst-common/instbin-krb.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# $OpenBSD: instbin-krb.conf,v 1.8 1998/11/20 00:20:49 deraadt Exp $	
-#
-# kcbin.conf - unified binary for the kc floppy
-#
-
-srcdirs distrib/special
-srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin sys/arch/sparc/stand
-
-progs cat chmod chown cp dd df disklabel ed expr fsck_ffs
-progs ftp getopt
-progs ifconfig init installboot less ln ls mkdir mknod mount mount_cd9660
-progs mount_ffs mount_nfs mount_kernfs
-progs mv newfs pax ksh ping pwd reboot rm route
-progs sed stty sync test tset umount
-progs gzip
-
-ln chown chgrp
-ln fsck_ffs fsck
-ln less more
-ln pax tar
-ln ksh sh
-ln ksh -sh		# init invokes the shell this way
-ln test [
-ln reboot halt
-
-libs -ledit -lutil -lcurses -lkrb -ldes -ll -lm
-
diff --git a/distrib/sparc/floppies/inst-common/instbin.conf b/distrib/sparc/floppies/inst-common/instbin.conf
deleted file mode 100644
index 35bab5922bf..00000000000
--- a/distrib/sparc/floppies/inst-common/instbin.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-# $OpenBSD: instbin.conf,v 1.16 1998/11/20 00:20:49 deraadt Exp $	
-#
-# kcbin.conf - unified binary for the kc floppy
-#
-
-srcdirs distrib/special
-srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin sys/arch/sparc/stand
-
-progs cat chmod chown cp dd df disklabel ed expr fsck_ffs
-progs ftp getopt
-progs ifconfig init installboot less ln ls mkdir mknod mount mount_cd9660
-progs mount_ffs mount_nfs mount_kernfs
-progs mv newfs pax ksh ping pwd reboot rm route
-progs sed stty sync test tset umount
-progs rsh gzip
-
-ln chown chgrp
-ln fsck_ffs fsck
-ln less more
-ln pax tar
-ln ksh sh
-ln ksh -sh		# init invokes the shell this way
-ln test [
-ln reboot halt
-
-libs -ledit -lutil -lcurses -ll -lm
diff --git a/distrib/sparc/floppies/inst-common/list b/distrib/sparc/floppies/inst-common/list
deleted file mode 100644
index 87b300b2df7..00000000000
--- a/distrib/sparc/floppies/inst-common/list
+++ /dev/null
@@ -1,82 +0,0 @@
-#	$OpenBSD: list,v 1.14 1998/12/20 23:36:42 millert Exp $
-
-# copy the crunched binary, link to it, and kill it
-COPY	${OBJDIR}/instbin	instbin
-LINK	instbin			bin/cat
-LINK	instbin			bin/chmod
-LINK	instbin			bin/cp
-LINK	instbin			bin/dd
-LINK	instbin			bin/df
-LINK	instbin			bin/ed
-LINK	instbin			bin/expr
-LINK	instbin			bin/ln
-LINK	instbin			bin/ls
-LINK	instbin			bin/mkdir
-LINK	instbin			bin/mv
-LINK	instbin			bin/pwd
-LINK	instbin			bin/rm
-LINK	instbin			bin/sh
-LINK	instbin			bin/stty
-LINK	instbin			bin/sync
-LINK	instbin			bin/tar
-LINK	instbin			bin/test
-LINK	instbin			bin/[
-LINK	instbin			sbin/disklabel
-LINK	instbin			sbin/fsck
-LINK	instbin			sbin/fsck_ffs
-LINK	instbin			sbin/halt
-LINK	instbin			sbin/ifconfig
-LINK	instbin			sbin/init
-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_nfs
-LINK	instbin			sbin/mount_kernfs
-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/umount
-SYMLINK	/bin/cat		usr/bin/chgrp
-SYMLINK	/bin/cat		usr/bin/ftp
-SYMLINK	/bin/cat		usr/bin/less
-SYMLINK	/bin/cat		usr/bin/getopt
-SYMLINK	/bin/cat		usr/bin/gzip
-SYMLINK	/bin/cat		usr/bin/more
-SYMLINK	/bin/cat		usr/bin/sed
-SYMLINK	/bin/cat		usr/bin/tset
-#SYMLINK /bin/cat		usr/bin/tip
-#SYMLINK /bin/cat		usr/sbin/bad144
-SYMLINK	/bin/cat		usr/sbin/chown
-SYMLINK	/bin/cat		usr/sbin/chroot
-SYMLINK	/bin/cat		usr/sbin/installboot
-# it's less confusing to leave instbin there and takes essentially no room.
-# SPECIAL	/bin/rm instbin
-SPECIAL sync
-
-# copy the MAKEDEV script and make some devices
-COPY	${DESTDIR}/dev/MAKEDEV	dev/MAKEDEV
-SPECIAL	cd dev; sh ${DESTDIR}/dev/MAKEDEV floppy
-
-# we need the contents of /usr/mdec
-#COPY	/usr/mdec/boot	usr/mdec/boot
-#COPY	/usr/mdec/bootxx	usr/mdec/bootxx
-#COPY	/usr/mdec/binstall	usr/mdec/binstall
-
-# 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/protocols	etc/protocols
-#COPY	${DESTDIR}/etc/pwd.db		etc/pwd.db
-COPY	${DESTDIR}/etc/services		etc/services
-#COPY	${DESTDIR}/etc/spwd.db		etc/spwd.db
-
-# and the common installation tools
-COPY	${TOPDIR}/inst-common/dot.commonutils	.commonutils
-# and a few useful bits of the termcap file (sun*, basic vt100, dumb, unknown)
-SPECIAL tic -C ${CURDIR}/../../../../share/termtypes/termtypes.master | sed -n -e 's,/usr/share/lib/tabset,/usr/share/tabset,g' -e 's,/usr/lib/tabset,/usr/share/tabset,g' -e '/^dumb|/,/:[ 	]*$/p' -e '/^unknown|/,/:[ 	]*$/p' -e '/^sun.*|/,/:[ 	]*$/p' -e '/^vt100|/,/:[ 	]*$/p' > usr/share/misc/termcap
diff --git a/distrib/sparc/floppies/inst-common/mtree.conf b/distrib/sparc/floppies/inst-common/mtree.conf
deleted file mode 100644
index cd198f1f7f0..00000000000
--- a/distrib/sparc/floppies/inst-common/mtree.conf
+++ /dev/null
@@ -1,77 +0,0 @@
-#	$OpenBSD: mtree.conf,v 1.4 1997/05/05 16:31:39 grr Exp $
-
-/set type=dir uname=root gname=wheel mode=0755
-# .
-.
-
-# ./bin
-bin
-# ./bin
-..
-
-# ./dev
-dev
-# ./dev
-..
-
-# ./etc
-etc
-# ./etc
-..
-
-# ./kern
-kern
-# ./kern
-..
-
-# ./mnt
-mnt
-# ./mnt
-..
-
-# ./mnt2
-#mnt2
-# ./mnt2
-..
-
-# ./sbin
-sbin
-# ./sbin
-..
-
-# ./tmp
-tmp
-# ./tmp
-..
-
-# ./usr
-usr
-
-# ./usr/bin
-bin
-# ./usr/bin
-..
-
-# ./usr/mdec
-mdec
-# ./usr/mdec
-..
-
-# ./usr/sbin
-sbin
-# ./usr/sbin
-..
-
-# ./usr/share
-share
-
-# ./usr/share/misc
-misc
-# ./usr/share/misc
-..
-
-# ./usr/share
-..
-
-# ./usr
-..
diff --git a/distrib/sparc/floppies/inst-common/termcap.pc3 b/distrib/sparc/floppies/inst-common/termcap.pc3
deleted file mode 100644
index d4880d0bf3e..00000000000
--- a/distrib/sparc/floppies/inst-common/termcap.pc3
+++ /dev/null
@@ -1,14 +0,0 @@
-sun|sun1|sun2|Sun Microsystems Inc. workstation console:\
-	:am:km:ms:\
-	:co#80:li#34:\
-	:%7=\E[194z:&5=\E[193z:&8=\E[195z:@7=\E[220z:AL=\E[%dL:\
-	:DC=\E[%dP:DL=\E[%dM:F1=\E[234z:F2=\E[235z:IC=\E[%d@:\
-	:K2=\E[218z:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=^L:\
-	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=^J:ei=:ic=\E[@:im=:\
-	:k1=\E[224z:k2=\E[225z:k3=\E[226z:k4=\E[227z:k5=\E[228z:\
-	:k6=\E[229z:k7=\E[230z:k8=\E[231z:k9=\E[232z:k;=\E[233z:\
-	:kD=\177:kN=\E[222z:kP=\E[216z:kb=^H:kd=\E[B:kh=\E[214z:\
-	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:md=\E[1m:me=\E[m:mr=\E[7m:\
-	:nd=\E[C:r2=\E[s:\
-	:..sa=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m:\
-	:se=\E[m:sf=^J:so=\E[7m:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
diff --git a/distrib/sparc/floppies/inst/Makefile b/distrib/sparc/floppies/inst/Makefile
deleted file mode 100644
index f9ba501b114..00000000000
--- a/distrib/sparc/floppies/inst/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#	$OpenBSD: Makefile,v 1.3 1997/05/01 11:30:47 niklas Exp $
-
-TOP=		${.CURDIR}/..
-
-.include "${TOP}/Makefile.inc"
-IMAGE=		inst${REV}.fs
-
-.include "${TOP}/inst-common/Makefile.inc"
diff --git a/distrib/sparc/floppies/inst/disktab.preinstall b/distrib/sparc/floppies/inst/disktab.preinstall
deleted file mode 100644
index 7f56ff9afcd..00000000000
--- a/distrib/sparc/floppies/inst/disktab.preinstall
+++ /dev/null
@@ -1,31 +0,0 @@
-#	$OpenBSD: disktab.preinstall,v 1.2 1997/05/01 11:30:48 niklas Exp $
-
-# Disk geometry and partition layout tables. 
-# Key:
-#	dt	controller type
-#	ty	type of disk (fixed, removeable, simulated)
-#	d[0-4]	drive-type-dependent parameters
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	sc	#sectors/cylinder, nc*nt default
-#	su	#sectors/unit, sc*nc default
-#	se	sector size, DEV_BSIZE default
-#	rm	rpm, 3600 default
-#	sf	supports bad144-style bad sector forwarding
-#	sk	sector skew per track, default 0
-#	cs	sector skew per cylinder, default 0
-#	hs	headswitch time, default 0
-#	ts	one-cylinder seek time, default 0
-#	il	sector interleave (n:1), 1 default
-#	bs	boot block size, default BBSIZE
-#	sb	superblock size, default SBSIZE
-#	o[a-h]	partition offsets in sectors
-#	p[a-h]	partition sizes in sectors
-#	b[a-h]	partition block sizes in bytes
-#	f[a-h]	partition fragment sizes in bytes
-#	t[a-h]	partition types (filesystem, swap, etc)
-#
-# All partition sizes reserve space for bad sector tables.
-# (5 cylinders needed for maintenance + replacement sectors)
-#
diff --git a/distrib/sparc/floppies/inst/dot.hdprofile b/distrib/sparc/floppies/inst/dot.hdprofile
deleted file mode 100644
index cb84333776f..00000000000
--- a/distrib/sparc/floppies/inst/dot.hdprofile
+++ /dev/null
@@ -1,121 +0,0 @@
-#	$OpenBSD: dot.hdprofile,v 1.5 1997/05/11 22:47:29 grr 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.
-
-PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
-export PATH
-
-umask 022
-
-# XXX
-# the TERM/EDITOR stuff is really well enough parameterized to be moved
-# into install.sub where it could use the routines there and be invoked
-# from the various (semi) MI install and upgrade scripts
-
-# terminals believed to be in termcap, default TERM
-TERMS="sun vt100 dumb"
-TERM=sun
-
-# editors believed to be in $EDITBIN, smart and dumb defaults
-EDITORS="ed"
-EDITOR=ed
-DUMB=ed
-EDITBIN=/bin
-EDITUBIN=/usr/bin
-
-if [ "X${DONEPROFILE}" = "X" ]; then
-	DONEPROFILE=YES
-
-	echo "Checking filesystems..."
-	fsck -y
-
-	echo "Mounting filesystems..."
-	mount -a
-
-	# set up some sane defaults
-	echo 'erase ^?, werase ^W, kill ^U, intr ^C'
-	stty newcrt werase ^W intr ^C kill ^U erase ^? 9600
-	echo ''
-
-	# get the terminal type
-	_forceloop=""
-	while [ "X$_forceloop" = X"" ]; do
-		echo "Supported terminals are: $TERMS"
-		eval `tset -s -m ":?$TERM"`
-		if [ "X$TERM" != X"unknown" ]; then
-			_forceloop="done"
-		fi
-	done
-	export TERM
-
-	# get the editor preference
-	if [ "X$TERM" = "Xdumb" -o "X$TERM" = "Xunknown" ]; then
-		echo -n "$TERM can't handle $EDITOR"
-		EDITOR="$DUMB"
-		echo ", using $EDITOR as text editor!"
-	elif [ "X$EDITOR" = "X$EDITORS" ]; then
-		echo "Only one editor available, you get to use $EDITOR!"
-	else
-		_forceloop=""
-		while [ "X$_forceloop" = X"" ]; do
-			echo "Supported editors are: $EDITORS"
-			echo -n "text editor? [$EDITOR] "
-			read _choice
-			if [ "X$_choice" = "X" ]; then
-				_choice="$EDITOR"
-				_forceloop="$_choice"
-			else
-				for _editor in $EDITORS; do
-					if [ "X$_choice" = "X$_editor" ]; then
-						_forceloop="$_choice"
-						break
-					fi
-				done
-			fi
-			if [ "X$_forceloop" != "X" -a ! \( -x $EDITBIN/$_choice
-						-o -x $EDITUBIN/$_choice \) ]
-			then
-				_forceloop=""
-			fi
-			if [ "X$_forceloop" = "X" ]; then
-				echo "Sorry, $_choice isn't available."
-				_forceloop=""
-			fi
-		done
-		EDITOR="$_choice"
-	fi
-	export EDITOR
-
-	# pull in the functions that people will use from the shell prompt.
-	. /.commonutils
-	. /.instutils
-
-	echo "Follow the installation directions to install the OpenBSD"
-	echo "distribution sets."
-fi
diff --git a/distrib/sparc/floppies/inst/dot.instutils b/distrib/sparc/floppies/inst/dot.instutils
deleted file mode 100644
index 496c10f1726..00000000000
--- a/distrib/sparc/floppies/inst/dot.instutils
+++ /dev/null
@@ -1,156 +0,0 @@
-#	$OpenBSD: dot.instutils,v 1.2 1996/04/25 21:31:16 niklas 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.
-
-# Installation configuration utilites (functions), to get OpenBSD configured
-# reasonably once it is installed on the hard disk.  These are meant to be
-# invoked from the shell prompt, by people installing OpenBSD.
-
-Configure()
-{
-	DEV=/dev
-	ETC=/etc
-	if [ ! -f /etc/fstab ]; then
-		DEV=/mnt/dev
-		ETC=/mnt/etc
-	fi
-
-	echo	"You will now be prompted for information about this"
-	echo	"machine.  If you hit return, the default answer (in"
-	echo	"brackets) will be used."
-
-	echo	""
-	echo -n	"What is this machine's hostname? [unknown.host.domain] "
-	read hname
-	if [ "$hname" = "" ]; then
-		hname=unknown.host.domain
-	fi
-	echo $hname > ${ETC}/myname
-	proto_domain=`echo $hname | sed -e 's/[^.]*\.//'`
-
-	echo	""
-	echo	"What domain is this machine in (this is NOT its YP"
-	echo -n	"domain name)? [$proto_domain] "
-	read dname
-	if [ "$dname" = "" ]; then
-		dname=$proto_domain
-	fi
-
-	echo	""
-	if [ -e $ETC/sendmail.cf ]; then
-		echo	"WARNING: A default sendmail.cf exists, and probably"
-		echo	"needs to be tuned and/or replaced, to work properly at"
-		echo	"your site!"
-	else
-		echo	"WARNING: No default sendmail.cf installed.  Did you"
-		echo	"forget to install the 'etc' distribution?"
-	fi
-
-	echo	"127.0.0.1	localhost localhost.$dname" > ${ETC}/hosts
-
-	echo	""
-	echo -n	"Does this machine have an ethernet interface? [y] "
-        read resp
-        case "$resp" in
-	n*)
-		;;
-	*)
-		intf=
-		while [ "$intf" = "" ]; do
-			echo -n "What is the primary interface name "
-			echo -n "(e.g. ed0, ep0, etc)? "
-			read intf
-		done
-		echo -n "What is the hostname for this interface? [$hname] "
-		read ifname
-		if [ "$ifname" = "" ]; then
-			ifname=$hname
-		fi
-		ifaddr=
-		while [ "$ifaddr" = "" ]; do
-			echo -n "What is the IP address associated with "
-			echo -n "interface ${intf}? "
-			read ifaddr
-		done
-		echo "$ifaddr	$ifname `echo $ifname | sed -e s/\.$dname//`" \
-		    >> ${ETC}/hosts
-
-		echo -n "Does this interface have a special netmask? [n] "
-		read resp
-		case "$resp" in
-			y*)
-				echo -n "What is the netmask? [0xffffff00] "
-				read ifnetmask
-				if [ "$ifnetmask" = "" ]; then
-					ifnetmask=0xffffff00
-				fi
-				;;
-			*)
-				ifnetmask=
-				;;
-		esac
-
-		echo -n "Does this interface need additional flags? [n] "
-		read resp
-		case "$resp" in
-			y*)
-				echo -n "What flags? [link0] "
-				read ifflags
-				if [ "$ifflags" = "" ]; then
-					ifflags=link0
-				fi
-				;;
-			*)
-				ifflags=
-				;;
-		esac
-		echo "inet $ifname $ifnetmask $ifflags" > ${ETC}/hostname.$intf
-
-		echo    ""
-		echo -n	"WARNING: if you have any more ethernet interfaces, "
-		echo	"you will have to configure"
-		echo -n "them by hand.  Read the comments in /etc/netstart to "
-		echo	"learn how to do this."
-		;;
-	esac
-	
-	echo	""
-	echo -n	"Making device nodes (may take a while)..."
-	cd ${DEV}
-	sh MAKEDEV all
-	echo	" done."
-
-	sync
-
-	echo	""
-	echo	"If you haven't already installed a kernel on the hard drive"
-	echo	"using your kernel-copy floppy, do so now.  Kernel"
-	echo 	"installation instructions can be found in the"
-	echo 	"installation notes."	
-}
diff --git a/distrib/sparc/floppies/inst/dot.profile b/distrib/sparc/floppies/inst/dot.profile
deleted file mode 100644
index f69670e4365..00000000000
--- a/distrib/sparc/floppies/inst/dot.profile
+++ /dev/null
@@ -1,122 +0,0 @@
-#       $OpenBSD: dot.profile,v 1.7 2000/01/30 01:21:22 deraadt 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 HISTFILE=/.sh_history
-
-umask 022
-
-set -o emacs # emacs-style command line editing
-alias dmesg="cat /kern/msgbuf"
-
-# XXX
-# the TERM/EDITOR stuff is really well enough parameterized to be moved
-# into install.sub where it could use the routines there and be invoked
-# from the various (semi) MI install and upgrade scripts
-
-# terminals believed to be in termcap, default TERM
-TERMS="sun vt100 dumb"
-TERM=sun
-
-# editors believed to be in $EDITBIN, smart and dumb defaults
-EDITORS="ed"
-EDITOR=ed
-DUMB=ed
-EDITBIN=/bin
-
-if [ "X${DONEPROFILE}" = "X" ]; then
-	DONEPROFILE=YES
-
-	# mount kernfs and re-mount the boot media (perhaps r/w)
-	mount_kernfs /kern /kern
-	mount_ffs -o update /kern/rootdev /
-
-	# set up some sane defaults
-	echo 'erase ^H, werase ^W, kill ^U, intr ^C'
-	stty newcrt werase ^W intr ^C kill ^U erase ^H 9600
-
-	# get the terminal type
-	_forceloop=""
-	while [ "X$_forceloop" = X"" ]; do
-		echo "Supported terminals are: $TERMS"
-		eval `tset -s -m ":?$TERM"`
-		if [ "X$TERM" != X"unknown" ]; then
-			_forceloop="done"
-		fi
-	done
-	export TERM
-
-	# get the editor preference
-	if [ "X$TERM" = "Xdumb" -o "X$TERM" = "Xunknown" ]; then
-		echo -n "$TERM can't handle $EDITOR"
-		EDITOR="$DUMB"
-		echo ", using $EDITOR as text editor!"
-	elif [ "X$EDITOR" = "X$EDITORS" ]; then
-		echo "Only one editor available, you get to use $EDITOR!"
-	else
-		_forceloop=""
-		while [ "X$_forceloop" = X"" ]; do
-			echo "Supported editors are: $EDITORS"
-			echo -n "text editor? [$EDITOR] "
-			read _choice
-			if [ "X$_choice" = "X" ]; then
-				_choice="$EDITOR"
-				_forceloop="$_choice"
-			else
-				for _editor in $EDITORS; do
-					if [ "X$_choice" = "X$_editor" ]; then
-						_forceloop="$_choice"
-						break
-					fi
-				done
-			fi
-			if [ "X$_forceloop" != "X" -a ! -x $EDITBIN/$_choice ]
-			then
-				_forceloop=""
-			fi
-			if [ "X$_forceloop" = "X" ]; then
-				echo "Sorry, $_choice isn't available."
-				_forceloop=""
-			fi
-		done
-		EDITOR="$_choice"
-	fi
-	export EDITOR
-
-	# pull in the functions that people will use from the shell prompt.
-	. /.commonutils
-	. /.instutils
-
-	# run the installation script.
-	install
-
-fi
-
diff --git a/distrib/sparc/floppies/inst/install.sh b/distrib/sparc/floppies/inst/install.sh
deleted file mode 100644
index f0cc0bf45fd..00000000000
--- a/distrib/sparc/floppies/inst/install.sh
+++ /dev/null
@@ -1,616 +0,0 @@
-#!/bin/sh
-#	$OpenBSD: install.sh,v 1.12 1998/11/03 04:17:21 aaron 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.
-
-#	OpenBSD installation script.
-#	In a perfect world, this would be a nice C program, with a reasonable
-#	user interface.
-
-DT=/etc/disktab				# /etc/disktab
-FSTABDIR=/mnt/etc			# /mnt/etc
-MSGBUF=/kern/msgbuf			# message buffer vs. dmesg
-#DONTDOIT=echo
-
-VERSION=2.0
-FSTAB=${FSTABDIR}/fstab
-
-getresp() {
-	read resp
-	if [ "X$resp" = "X" ]; then
-		resp=$1
-	fi
-}
-
-echo	"Welcome to the OpenBSD ${VERSION} installation program."
-echo	""
-echo	"This program is will put OpenBSD on your hard disk.  It is not"
-echo	"painless, but it could be worse.  You'll be asked several questions,"
-echo	"and it would probably be useful to have your disk's hardware"
-echo	"manual, the installation notes, and a calculator handy."
-echo	""
-echo	"In particular, you will need to know some reasonably detailed"
-echo	"information about your disk's geometry, because there is currently"
-echo	"no way this this program can figure that information out."
-echo	""
-echo	"As with anything which modifies your hard drive's contents, this"
-echo	"program can cause SIGNIFICANT data loss, and you are advised"
-echo	"to make sure your hard drive is backed up before beginning the"
-echo	"installation process."
-echo	""
-echo	"Default answers are displyed in brackets after the questions."
-echo	"You can hit Control-C at any time to quit, but if you do so at a"
-echo	"prompt, you may have to hit return.  Also, quitting in the middle of"
-echo	"installation may leave your system in an inconsistent state."
-echo	""
-echo -n "Proceed with installation? [n] "
-getresp "n"
-case "$resp" in
-y*|Y*)
-	echo	"Cool!  Let's get to it..."
-	;;
-*)
-	echo	"OK, then.  Enter 'halt' at the prompt to halt the"
-	echo	"machine.  Once the machine has halted, remove the"
-	echo	"floppy and press any key to reboot."
-	exit
-	;;
-esac
-
-echo	""
-echo	"To do the installation, you'll need to provide some information about"
-echo	"your disk."
-
-	drivetype=sd
-	sect_fwd=""
-	type=SCSI
-
-# find out what units are possible for that disk, and query the user.
-driveunits=`ls /dev/${drivetype}?a | sed -e 's,/dev/\(...\)a,\1,g'`
-if [ "X${driveunits}" = "X" ]; then
-	echo	"FATAL ERROR:"
-	echo	"No devices for disks of type '${drivetype}'."
-	echo	"This is probably a bug in the install disks."
-	echo	"Exiting install program."
-	exit
-fi
-prefdrive=${drivetype}0
-
-echo	"The following ${drivetype}-type disks are supported by this"
-echo	"installation procedure:"
-echo	"${driveunits}"
-echo	"Note that they may not exist in _your_ machine; the list of"
-echo	"disks in your machine was printed when the system was booting."
-while [ "X${drivename}" = "X" ]; do
-	echo -n	"Which disk would like to install on? [${prefdrive}] "
-	getresp ${prefdrive}
-	otherdrives=`echo "${driveunits}" | sed -e s,${resp},,`
-	if [ "X${driveunits}" = "X${otherdrives}" ]; then
-		echo	"\"${resp}\" is an invalid drive name.  Valid choices"
-		echo	"are: "${driveunits}
-	else
-		drivename=${resp}
-	fi
-done
-
-echo	""
-echo	"Using disk ${drivename}."
-echo -n	"What kind of disk is it? (one word please) [my${drivetype}] "
-getresp "my${drivetype}"
-labelname=$resp
-
-echo	""
-echo	"You will now need to provide some information about your disk's"
-echo	"geometry.  This should either be in the User's Manual for your disk,"
-echo	"or you should have written down what OpenBSD printed when booting."
-echo	"(Note that he geometry that's printed at boot time is preferred.)"
-echo	""
-echo    "You may choose to view the initial boot messages for your system"
-echo    "again right now if you like."
-echo -n "View the boot messages again? [n] "
-getresp "n"
-case "$resp" in
-y*|Y*)
-	less -rsS $MSGBUF
-	;;
-*)
-	echo	""
-	;;
-esac
-
-echo	"You will now enter the disk geometry information"
-echo	""
-
-# 1st arg is 1 more than arg needed
-args () 
-{
-	eval echo \$\{$1\}
-}
-
-bytes_per_sect=`cat $MSGBUF | sed -n -e /^${drivename}:/p -e /^${drivename}:/q`
-bytes_per_sect=`args 10 $bytes_per_sect`
-
-echo -n "Number of bytes per disk sector? [$bytes_per_sect] "
-getresp $bytes_per_sect
-bytes_per_sect="$resp"
-
-cyls_per_disk=`cat $MSGBUF | sed -n -e /^${drivename}:/p -e /^${drivename}:/q`
-cyls_per_disk=`args 4 $cyls_per_disk`
-
-echo -n "Number of disk cylinders? [$cyls_per_disk]"
-getresp $cyls_per_disk
-cyls_per_disk="$resp"
-
-tracks_per_cyl=`cat $MSGBUF | sed -n -e /^${drivename}:/p -e /^${drivename}:/q`
-tracks_per_cyl=`args 6 $tracks_per_cyl`
-
-echo -n "Number of disk tracks (heads) per disk cylinder? [$tracks_per_cyl]"
-getresp $tracks_per_cyl
-tracks_per_cyl="$resp"
-
-sects_per_track=`sed -n -e /^${drivename}:/p -e /^${drivename}:/q $MSGBUF`
-sects_per_track=`args 8 $sects_per_track`
-
-echo -n "Number of disk sectors per disk track? [$sects_per_track]"
-getresp $sects_per_track
-sects_per_track="$resp"
-
-cylindersize=`expr $sects_per_track \* $tracks_per_cyl`
-cylbytes=`expr $cylindersize \* $bytes_per_sect`
-disksize=`expr $cylindersize \* $cyls_per_disk`
-
-echo	""
-echo	"Your disk has a total of $disksize $bytes_per_sect byte sectors,"
-echo	"arranged as $cyls_per_disk cylinders which contain $cylindersize "
-echo	"sectors ($cylbytes bytes) each."
-echo	""
-echo	"You can specify partition sizes in cylinders ('c') or sectors ('s')."
-while [ "X${sizemult}" = "X" ]; do
-	echo -n	"What units would you like to use? [cylinders] "
-	getresp cylinders
-	case "$resp" in
-	c*|C*)
-		sizemult=$cylindersize
-		sizeunit="cylinders"
-		maxdisk=$cyls_per_disk
-		;;
-	s*|S*)
-		sizemult=1
-		sizeunit="sectors"
-		maxdisk=$disksize;
-		;;
-	*)
-		echo	"Enter cylinders ('c') or sectors ('s')."
-		;;
-	esac
-done
-
-echo -n ""
-echo -n "Size of OpenBSD portion of disk (in $sizeunit) ? [$maxdisk] "
-getresp "$maxdisk"
-partition=$resp
-partition_sects=`expr $resp \* $sizemult`
-part_offset=0
-if [ $partition_sects -lt $disksize ]; then
-        echo -n "Offset of OpenBSD portion of disk (in $sizeunit)? "
-        getresp
-        part_offset=$resp
-fi
-badspacesec=0
-if [ "$sect_fwd" = "sf:" ]; then
-	badspacecyl=`expr $sects_per_track + 126`
-	badspacecyl=`expr $badspacecyl + $cylindersize - 1`
-	badspacecyl=`expr $badspacecyl / $cylindersize`
-	badspacesec=`expr $badspacecyl \* $cylindersize`
-	echo	""
-	echo -n "Using $badspacesec sectors ($badspacecyl cylinders) for the "
-	echo	"bad144 bad block table"
-fi
-
-sects_left=`expr $partition_sects - $badspacesec`
-units_left=`expr $sects_left / $sizemult`
-echo	""
-echo	"There are $units_left $sizeunit left to allocate."
-echo	""
-root=0
-while [ $root -eq 0 ]; do
-	echo -n "Root partition size (in $sizeunit)? "
-	getresp
-	case $resp in
-	[1-9]*)
-		total=$resp
-		if [ $total -gt $units_left ]; then
-			echo -n	"Root size is greater than remaining "
-			echo	"free space on disk."
-		else
-			root=$resp
-		fi
-		;;
-	esac
-done
-root_offset=$part_offset
-part_used=`expr $root + $badspacesec / $sizemult`
-units_left=`expr $partition - $part_used`
-echo	""
-
-swap=0
-while [ $swap -eq 0 ]; do 
-	echo	"$units_left $sizeunit remaining in OpenBSD portion of disk."
-	echo -n	"Swap partition size (in $sizeunit)? "
-	getresp
-	case $resp in
-	[1-9]*)
-		if [ $swap -gt $units_left ]; then
-			echo -n	"Swap size is greater than remaining "
-			echo	"free space on disk."
-		else
-			swap=$resp
-		fi
-		;;
-	esac
-done
-swap_offset=`expr $root_offset + $root`
-part_used=`expr $part_used + $swap`
-echo	""
-
-fragsize=1024
-blocksize=8192
-cat /etc/disktab.preinstall > $DT
-echo	"" >> $DT
-echo	"$labelname|OpenBSD installation generated:\\" >> $DT
-echo	"	:dt=${type}:ty=winchester:\\" >> $DT
-echo -n	"	:nc#${cyls_per_disk}:ns#${sects_per_track}" >> $DT
-echo	":nt#${tracks_per_cyl}:\\" >> $DT
-echo	"	:se#${bytes_per_sect}:${sect_fwd}\\" >> $DT
-_size=`expr $root \* $sizemult`
-_offset=`expr $root_offset \* $sizemult`
-echo -n	"	:pa#${_size}:oa#${_offset}" >> $DT
-echo	":ta=4.2BSD:ba#${blocksize}:fa#${fragsize}:\\" >> $DT
-_size=`expr $swap \* $sizemult`
-_offset=`expr $swap_offset \* $sizemult`
-echo	"	:pb#${_size}:ob#${_offset}:tb=swap:\\" >> $DT
-echo	"	:pc#${disksize}:oc#0:\\" >> $DT
-
-echo	"You will now have to enter information about any other partitions"
-echo	"to be created in the OpenBSD portion of the disk.  This process will"
-echo	"be complete when you've filled up all remaining space in the OpenBSD"
-echo	"portion of the disk."
-
-while [ $part_used -lt $partition ]; do
-	part_size=0
-	units_left=`expr $partition - $part_used`
-	while [ $part_size -eq 0 ]; do
-		echo	""
-		echo -n	"$units_left $sizeunit remaining in OpenBSD portion of "
-		echo	"the disk"
-		echo -n "Next partition size (in $sizeunit) [$units_left] ? "
-		getresp "$units_left"
-		case $resp in
-		[1-9]*)
-			total=`expr $part_used + $resp`
-			if [ $total -gt $partition ]; then
-				echo "That would make the partition too large to fit!"
-			else
-				part_size=$resp
-				part_used=$total
-				part_name=""
-				while [ "$part_name" = "" ]; do
-					echo -n "Mount point? "
-					getresp
-					part_name=$resp
-				done
-			fi
-			;;
-		esac
-	done
-	# XXX we skip partition d to avoid user confusion
-	if [ "$ename" = "" ]; then
-		ename=$part_name
-		offset=`expr $part_offset + $root + $swap`
-		_size=`expr $part_size \* $sizemult`
-		_offset=`expr $offset \* $sizemult`
-		echo -n "	:pe#${_size}:oe#${_offset}" >> $DT
-		echo ":te=4.2BSD:be#${blocksize}:fe#${fragsize}:\\" >> $DT
-		offset=`expr $offset + $part_size`
-	elif [ "$fname" = "" ]; then
-		fname=$part_name
-		_size=`expr $part_size \* $sizemult`
-		_offset=`expr $offset \* $sizemult`
-		echo -n "	:pf#${_size}:of#${_offset}" >> $DT
-		echo ":tf=4.2BSD:bf#${blocksize}:ff#${fragsize}:\\" >> $DT
-		offset=`expr $offset + $part_size`
-	elif [ "$gname" = "" ]; then
-		gname=$part_name
-		_size=`expr $part_size \* $sizemult`
-		_offset=`expr $offset \* $sizemult`
-		echo -n "	:pg#${_size}:og#${_offset}" >> $DT
-		echo ":tg=4.2BSD:bg#${blocksize}:fg#${fragsize}:\\" >> $DT
-		offset=`expr $offset + $part_size`
-	elif [ "$hname" = "" ]; then
-		hname=$part_name
-		_size=`expr $part_size \* $sizemult`
-		_offset=`expr $offset \* $sizemult`
-		echo -n "	:ph#${_size}:oh#${_offset}" >> $DT
-		echo ":th=4.2BSD:bh#${blocksize}:fh#${fragsize}:\\" >> $DT
-		part_used=$partition
-	elif [ "$iname" = "" ]; then
-		iname=$part_name
-		_size=`expr $part_size \* $sizemult`
-		_offset=`expr $offset \* $sizemult`
-		echo -n "	:pi#${_size}:oi#${_offset}" >> $DT
-		echo ":ti=4.2BSD:bi#${blocksize}:fi#${fragsize}:\\" >> $DT
-		part_used=$partition
-	elif [ "$jname" = "" ]; then
-		jname=$part_name
-		_size=`expr $part_size \* $sizemult`
-		_offset=`expr $offset \* $sizemult`
-		echo -n "	:pj#${_size}:oj#${_offset}" >> $DT
-		echo ":tj=4.2BSD:bj#${blocksize}:fj#${fragsize}:\\" >> $DT
-		part_used=$partition
-	elif [ "$kname" = "" ]; then
-		kname=$part_name
-		_size=`expr $part_size \* $sizemult`
-		_offset=`expr $offset \* $sizemult`
-		echo -n "	:pk#${_size}:ok#${_offset}" >> $DT
-		echo ":tk=4.2BSD:bk#${blocksize}:fk#${fragsize}:\\" >> $DT
-		part_used=$partition
-	elif [ "$lname" = "" ]; then
-		lname=$part_name
-		_size=`expr $part_size \* $sizemult`
-		_offset=`expr $offset \* $sizemult`
-		echo -n "	:pl#${_size}:ol#${_offset}" >> $DT
-		echo ":tl=4.2BSD:bl#${blocksize}:fl#${fragsize}:\\" >> $DT
-		part_used=$partition
-	elif [ "$mname" = "" ]; then
-		mname=$part_name
-		_size=`expr $part_size \* $sizemult`
-		_offset=`expr $offset \* $sizemult`
-		echo -n "	:pm#${_size}:om#${_offset}" >> $DT
-		echo ":tm=4.2BSD:bm#${blocksize}:fm#${fragsize}:\\" >> $DT
-		part_used=$partition
-	elif [ "$nname" = "" ]; then
-		nname=$part_name
-		_size=`expr $part_size \* $sizemult`
-		_offset=`expr $offset \* $sizemult`
-		echo -n "	:pn#${_size}:on#${_offset}" >> $DT
-		echo ":tn=4.2BSD:bn#${blocksize}:fn#${fragsize}:\\" >> $DT
-		part_used=$partition
-	elif [ "$oname" = "" ]; then
-		oname=$part_name
-		_size=`expr $part_size \* $sizemult`
-		_offset=`expr $offset \* $sizemult`
-		echo -n "	:po#${_size}:oo#${_offset}" >> $DT
-		echo ":to=4.2BSD:bo#${blocksize}:fo#${fragsize}:\\" >> $DT
-		part_used=$partition
-	elif [ "$pname" = "" ]; then
-		pname=$part_name
-		_size=`expr $part_size \* $sizemult`
-		_offset=`expr $offset \* $sizemult`
-		echo -n "	:pp#${_size}:op#${_offset}" >> $DT
-		echo ":tp=4.2BSD:bp#${blocksize}:fp#${fragsize}:\\" >> $DT
-		part_used=$partition
-	fi
-done
-echo "" >> $DT
-sync
-
-echo	""
-echo	"THIS IS YOUR LAST CHANCE!!!"
-echo	""
-echo -n	"Are you SURE you want OpenBSD installed on your hard drive? (yes/no) "
-answer=""
-while [ "$answer" = "" ]; do
-	getresp
-	case $resp in
-	yes|YES)
-		echo	""
-		echo	"Here we go..."
-		answer=yes
-		;;
-	no|NO)
-		echo	""
-		echo -n	"OK, then.  enter 'halt' to halt the machine.  "
-		echo    "Once the machine has halted,"
-		echo -n	"remove the floppy, and press any key to "
-		echo	"reboot."
-		exit
-		;;
-	*)
-		echo -n "I want a yes or no answer...  well? "
-		;;
-	esac
-done
-
-echo	""
-echo -n	"Labeling disk $drivename..."
-$DONTDOIT disklabel -w $drivename $labelname
-echo	" done."
-
-if [ "$sect_fwd" = "sf:" ]; then
-	echo -n "Initializing bad144 badblock table..."
-	$DONTDOIT bad144 $drivename 0
-	echo " done."
-fi
-
-echo	"Initializing root filesystem, and mounting..."
-$DONTDOIT newfs /dev/r${drivename}a
-$DONTDOIT mount -v /dev/${drivename}a /mnt
-if [ "$ename" != "" ]; then
-	echo	""
-	echo	"Initializing $ename filesystem, and mounting..."
-	$DONTDOIT newfs /dev/r${drivename}e
-	$DONTDOIT mkdir -p /mnt/$ename
-	$DONTDOIT mount -v /dev/${drivename}e /mnt/$ename
-fi
-
-echo	"Installing boot block in root filesystem..."
-$DONTDOIT /usr/mdec/binstall -v ffs /mnt
-
-if [ "$fname" != "" ]; then
-	echo	""
-	echo	"Initializing $fname filesystem, and mounting..."
-	$DONTDOIT newfs /dev/r${drivename}f
-	$DONTDOIT mkdir -p /mnt/$fname
-	$DONTDOIT mount -v /dev/${drivename}f /mnt/$fname
-fi
-if [ "$gname" != "" ]; then
-	echo	""
-	echo	"Initializing $gname filesystem, and mounting..."
-	$DONTDOIT newfs /dev/r${drivename}g
-	$DONTDOIT mkdir -p /mnt/$gname
-	$DONTDOIT mount -v /dev/${drivename}g /mnt/$gname
-fi
-if [ "$hname" != "" ]; then
-	echo	""
-	echo	"Initializing $hname filesystem, and mounting..."
-	$DONTDOIT newfs /dev/r${drivename}h
-	$DONTDOIT mkdir -p /mnt/$hname
-	$DONTDOIT mount -v /dev/${drivename}h /mnt/$hname
-fi
-if [ "$iname" != "" ]; then
-	echo	""
-	echo	"Initializing $iname filesystem, and mounting..."
-	$DONTDOIT newfs /dev/r${drivename}i
-	$DONTDOIT mkdir -p /mnt/$iname
-	$DONTDOIT mount -v /dev/${drivename}i /mnt/$iname
-fi
-if [ "$jname" != "" ]; then
-	echo	""
-	echo	"Initializing $jname filesystem, and mounting..."
-	$DONTDOIT newfs /dev/r${drivename}j
-	$DONTDOIT mkdir -p /mnt/$jname
-	$DONTDOIT mount -v /dev/${drivename}j /mnt/$jname
-fi
-if [ "$kname" != "" ]; then
-	echo	""
-	echo	"Initializing $kname filesystem, and mounting..."
-	$DONTDOIT newfs /dev/r${drivename}k
-	$DONTDOIT mkdir -p /mnt/$kname
-	$DONTDOIT mount -v /dev/${drivename}k /mnt/$kname
-fi
-if [ "$lname" != "" ]; then
-	echo	""
-	echo	"Initializing $lname filesystem, and mounting..."
-	$DONTDOIT newfs /dev/r${drivename}l
-	$DONTDOIT mkdir -p /mnt/$lname
-	$DONTDOIT mount -v /dev/${drivename}l /mnt/$lname
-fi
-if [ "$mname" != "" ]; then
-	echo	""
-	echo	"Initializing $mname filesystem, and mounting..."
-	$DONTDOIT newfs /dev/r${drivename}m
-	$DONTDOIT mkdir -p /mnt/$mname
-	$DONTDOIT mount -v /dev/${drivename}m /mnt/$mname
-fi
-if [ "$nname" != "" ]; then
-	echo	""
-	echo	"Initializing $nname filesystem, and mounting..."
-	$DONTDOIT newfs /dev/r${drivename}n
-	$DONTDOIT mkdir -p /mnt/$nname
-	$DONTDOIT mount -v /dev/${drivename}n /mnt/$nname
-fi
-if [ "$oname" != "" ]; then
-	echo	""
-	echo	"Initializing $oname filesystem, and mounting..."
-	$DONTDOIT newfs /dev/r${drivename}o
-	$DONTDOIT mkdir -p /mnt/$oname
-	$DONTDOIT mount -v /dev/${drivename}o /mnt/$oname
-fi
-if [ "$pname" != "" ]; then
-	echo	""
-	echo	"Initializing $pname filesystem, and mounting..."
-	$DONTDOIT newfs /dev/r${drivename}p
-	$DONTDOIT mkdir -p /mnt/$pname
-	$DONTDOIT mount -v /dev/${drivename}p /mnt/$pname
-fi
-
-echo	""
-echo    "Populating filesystems with bootstrapping binaries and config files"
-$DONTDOIT tar -cXf - . | (cd /mnt ; tar -xpf - )
-$DONTDOIT cp /tmp/.hdprofile /mnt/.profile
-
-echo	""
-echo -n	"Creating an fstab..."
-echo /dev/${drivename}a / ffs rw 1 1 | sed -e s,//,/, > $FSTAB
-if [ "$ename" != "" ]; then
-	echo /dev/${drivename}e /$ename ffs rw 1 2 | sed -e s,//,/, >> $FSTAB
-fi
-if [ "$fname" != "" ]; then
-	echo /dev/${drivename}f /$fname ffs rw 1 3 | sed -e s,//,/, >> $FSTAB
-fi
-if [ "$gname" != "" ]; then
-	echo /dev/${drivename}g /$gname ffs rw 1 4 | sed -e s,//,/, >> $FSTAB
-fi
-if [ "$hname" != "" ]; then
-	echo /dev/${drivename}h /$hname ffs rw 1 5 | sed -e s,//,/, >> $FSTAB
-fi
-if [ "$iname" != "" ]; then
-	echo /dev/${drivename}i /$iname ffs rw 1 5 | sed -e s,//,/, >> $FSTAB
-fi
-if [ "$jname" != "" ]; then
-	echo /dev/${drivename}j /$jname ffs rw 1 5 | sed -e s,//,/, >> $FSTAB
-fi
-if [ "$kname" != "" ]; then
-	echo /dev/${drivename}k /$kname ffs rw 1 5 | sed -e s,//,/, >> $FSTAB
-fi
-if [ "$lname" != "" ]; then
-	echo /dev/${drivename}l /$lname ffs rw 1 5 | sed -e s,//,/, >> $FSTAB
-fi
-if [ "$mname" != "" ]; then
-	echo /dev/${drivename}m /$mname ffs rw 1 5 | sed -e s,//,/, >> $FSTAB
-fi
-if [ "$nname" != "" ]; then
-	echo /dev/${drivename}n /$nname ffs rw 1 5 | sed -e s,//,/, >> $FSTAB
-fi
-if [ "$oname" != "" ]; then
-	echo /dev/${drivename}o /$oname ffs rw 1 5 | sed -e s,//,/, >> $FSTAB
-fi
-if [ "$pname" != "" ]; then
-	echo /dev/${drivename}p /$pname ffs rw 1 5 | sed -e s,//,/, >> $FSTAB
-fi
-
-sync
-echo	" done."
-
-echo	"OK!  The preliminary work of setting up your disk is now complete."
-echo 	""
-echo	"The remaining tasks are:"
-echo	""
-echo	"To copy a OpenBSD kernel to the hard drive's root filesystem."
-echo	"Once accomplished, you can boot off the hard drive."
-echo	""
-echo	"To load and install the OpenBSD distribution sets."
-echo	"Currently the hard drive's root filesystem is mounted on /mnt"
-echo	""
-echo	"Consult the installation notes which will describe how to"
-echo	"install the distribution sets and kernel.  Post-installation"
-echo	"configuration is also discussed therein."
-echo	""
-echo	"GOOD LUCK!"
-echo	""
diff --git a/distrib/sparc/floppies/inst/list b/distrib/sparc/floppies/inst/list
deleted file mode 100644
index 692cbdb8ce5..00000000000
--- a/distrib/sparc/floppies/inst/list
+++ /dev/null
@@ -1,16 +0,0 @@
-#	$OpenBSD: list,v 1.6 1997/05/11 22:47:31 grr Exp $
-
-# the disktab explanation file
-COPY	disktab.preinstall		etc/disktab.preinstall
-
-# and the installation tools
-COPY	dot.profile			.profile
-COPY	dot.instutils			.instutils
-COPY	install.sh			install
-COPY	dot.hdprofile			tmp/.hdprofile
-
-# we need the contents of /usr/mdec
-COPYDIR	${DESTDIR}/usr/mdec	usr/mdec
-
-# make install executable
-SPECIAL	chmod 755 install
diff --git a/distrib/sparc/floppies/kernel/Makefile b/distrib/sparc/floppies/kernel/Makefile
deleted file mode 100644
index 61d220f8108..00000000000
--- a/distrib/sparc/floppies/kernel/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-#	$OpenBSD: Makefile,v 1.13 1998/02/09 06:15:56 deraadt Exp $
-
-.include "../Makefile.inc"
-
-MOUNT_POINT?=	/mnt
-VND?=		svnd0
-VND_DEV=	/dev/${VND}a
-VND_RDEV=	/dev/r${VND}a
-IMAGE=		kc${REV}.fs
-PID!=		echo $$$$
-REALIMAGE!=	echo /var/tmp/image.${PID}
-MDEC=		${DESTDIR}/usr/mdec
-
-LISTS=		${.CURDIR}/list
-
-bsd:
-	cd ${.CURDIR}/../../../../sys/arch/sparc/conf && config FLOPPY
-	cd ${.CURDIR}/../../../../sys/arch/sparc/compile/FLOPPY && \
-	    make clean && make depend && make
-	cp ${.CURDIR}/../../../../sys/arch/sparc/compile/FLOPPY/bsd bsd
-
-all:	bsd
-	dd if=/dev/zero of=${REALIMAGE} bs=10k count=144
-	vnconfig -v -c ${VND} ${REALIMAGE}
-	disklabel -w ${VND} floppy
-	newfs -O -m 0 -o space -i 20480 -c 80 ${VND_RDEV}
-	mount ${VND_DEV} ${MOUNT_POINT}
-	sync; /usr/mdec/binstall -v ffs ${MOUNT_POINT}
-	TOPDIR=${.CURDIR}/.. CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    TARGDIR=${MOUNT_POINT} sh ${.CURDIR}/../runlist.sh ${LISTS}
-	mtree -def ${.CURDIR}/mtree.conf -p ${MOUNT_POINT}/ -u
-	df -i ${MOUNT_POINT}
-	umount ${MOUNT_POINT}
-	vnconfig -u ${VND}
-	cp ${REALIMAGE} ${IMAGE}
-	rm ${REALIMAGE}
-
-unconfig:
-	-umount -f ${MOUNT_POINT}
-	-vnconfig -u ${VND}
-	-/bin/rm -f ${IMAGE}
-
-clean cleandir:
-	/bin/rm -f ${IMAGE} bsd
-
-beforeinstall:
-	cp ${IMAGE} ${DESTDIR}/snapshot
-
-.include <bsd.obj.mk>
-.include <bsd.subdir.mk>
diff --git a/distrib/sparc/floppies/kernel/list b/distrib/sparc/floppies/kernel/list
deleted file mode 100644
index 66343b63e9f..00000000000
--- a/distrib/sparc/floppies/kernel/list
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$OpenBSD: list,v 1.4 1997/05/01 11:30:55 niklas Exp $
-
-# copy the kernel
-COPY	${OBJDIR}/bsd	bsd
diff --git a/distrib/sparc/floppies/kernel/mtree.conf b/distrib/sparc/floppies/kernel/mtree.conf
deleted file mode 100644
index 11c2bf83503..00000000000
--- a/distrib/sparc/floppies/kernel/mtree.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$OpenBSD: mtree.conf,v 1.2 1997/05/01 11:30:56 niklas Exp $
-
-/set type=dir uname=root gname=wheel mode=0755
-# .
-.
-
diff --git a/distrib/sparc/floppies/list2sh.awk b/distrib/sparc/floppies/list2sh.awk
deleted file mode 100644
index 42c3c54505e..00000000000
--- a/distrib/sparc/floppies/list2sh.awk
+++ /dev/null
@@ -1,60 +0,0 @@
-#	$OpenBSD: list2sh.awk,v 1.3 1997/05/05 16:31:37 grr Exp $
-
-BEGIN {
-	printf("cd ${CURDIR}\n");
-	printf("\n");
-}
-/^$/ || /^#/ {
-	print $0;
-	next;
-}
-$1 == "COPY" {
-	printf("echo '%s'\n", $0);
-	printf("rm -f ${TARGDIR}/%s\n", $3);
-	printf("cp %s ${TARGDIR}/%s\n", $2, $3);
-	next;
-}
-$1 == "LINK" {
-	printf("echo '%s'\n", $0);
-	printf("rm -f ${TARGDIR}/%s\n", $3);
-	printf("(cd ${TARGDIR}; ln %s %s)\n", $2, $3);
-	next;
-}
-$1 == "SYMLINK" {
-	printf("echo '%s'\n", $0);
-	printf("rm -f ${TARGDIR}/%s\n", $3);
-	printf("(cd ${TARGDIR}; ln -s %s %s)\n", $2, $3);
-	next;
-}
-$1 == "COPYDIR" {
-	printf("echo '%s'\n", $0);
-	printf("(cd ${TARGDIR}/%s && find . ! -name . | xargs /bin/rm -rf)\n",
-	    $3);
-	printf("(cd %s && find . ! -name . | cpio -pdamu ${TARGDIR}/%s)\n", $2,
-	    $3);
-	next;
-}
-$1 == "SPECIAL" {
-# escaping shell quotation is ugly whether you use " or ', use cat <<'!' ...
-	work=$0;
-	gsub("[\\\\]", "\\\\", work);
-	gsub("[\"]", "\\\"", work);
-	gsub("[$]", "\\$", work);
-	gsub("[`]", "\\`", work);
-	printf("echo \"%s\"\n", work);
-	work=$0;
-	sub("^[ 	]*" $1 "[ 	]*", "", work);
-	printf("(cd ${TARGDIR}; %s)\n", work);
- 	next;
- }
-{
-	printf("echo '%s'\n", $0);
-	printf("echo 'Unknown keyword \"%s\" at line %d of input.'\n", $1, NR);
-	printf("exit 1\n");
-	exit 1;
-}
-END {
-	printf("\n");
-	printf("exit 0\n");
-	exit 0;
-}
diff --git a/distrib/sparc/floppies/runlist.sh b/distrib/sparc/floppies/runlist.sh
deleted file mode 100644
index 5ba7ce6a2db..00000000000
--- a/distrib/sparc/floppies/runlist.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#	$OpenBSD: runlist.sh,v 1.2 1997/05/01 11:30:46 niklas Exp $
-
-if [ "X$1" = "X-d" ]; then
-	SHELLCMD=cat
-	shift
-else
-	SHELLCMD="sh -e"
-fi
-
-( while [ "X$1" != "X" ]; do
-	cat $1
-	shift
-done ) | awk -f ${TOPDIR}/list2sh.awk | ${SHELLCMD}
diff --git a/distrib/sparc/floppies/upgr/Makefile b/distrib/sparc/floppies/upgr/Makefile
deleted file mode 100644
index 854fc857d9c..00000000000
--- a/distrib/sparc/floppies/upgr/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#	$OpenBSD: Makefile,v 1.3 1997/05/01 11:30:57 niklas Exp $
-
-TOP=		${.CURDIR}/..
-
-.include "${TOP}/Makefile.inc"
-IMAGE=		upgr${REV}.fs
-
-.include "${TOP}/inst-common/Makefile.inc"
diff --git a/distrib/sparc/floppies/upgr/dot.hdprofile b/distrib/sparc/floppies/upgr/dot.hdprofile
deleted file mode 100644
index efe3275773a..00000000000
--- a/distrib/sparc/floppies/upgr/dot.hdprofile
+++ /dev/null
@@ -1,122 +0,0 @@
-#	$OpenBSD: dot.hdprofile,v 1.5 1997/05/11 22:47:34 grr 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.
-
-
-PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
-export PATH
-
-umask 022
-
-# XXX
-# the TERM/EDITOR stuff is really well enough parameterized to be moved
-# into install.sub where it could use the routines there and be invoked
-# from the various (semi) MI install and upgrade scripts
-
-# terminals believed to be in termcap, default TERM
-TERMS="sun vt100 dumb"
-TERM=sun
-
-# editors believed to be in $EDITBIN, smart and dumb defaults
-EDITORS="ed"
-EDITOR=ed
-DUMB=ed
-EDITBIN=/bin
-EDITUBIN=/usr/bin
-
-if [ "X${DONEPROFILE}" = "X" ]; then
-	DONEPROFILE=YES
-
-	echo "Checking filesystems..."
-	fsck -y
-
-	echo "Mounting filesystems..."
-	mount -a
-
-	# set up some sane defaults
-	echo 'erase ^?, werase ^W, kill ^U, intr ^C'
-	stty newcrt werase ^W intr ^C kill ^U erase ^? 9600
-	echo ''
-
-	# get the terminal type
-	_forceloop=""
-	while [ "X$_forceloop" = X"" ]; do
-		echo "Supported terminals are: $TERMS"
-		eval `tset -s -m ":?$TERM"`
-		if [ "X$TERM" != X"unknown" ]; then
-			_forceloop="done"
-		fi
-	done
-	export TERM
-
-	# get the editor preference
-	if [ "X$TERM" = "Xdumb" -o "X$TERM" = "Xunknown" ]; then
-		echo -n "$TERM can't handle $EDITOR"
-		EDITOR="$DUMB"
-		echo ", using $EDITOR as text editor!"
-	elif [ "X$EDITOR" = "X$EDITORS" ]; then
-		echo "Only one editor available, you get to use $EDITOR!"
-	else
-		_forceloop=""
-		while [ "X$_forceloop" = X"" ]; do
-			echo "Supported editors are: $EDITORS"
-			echo -n "text editor? [$EDITOR] "
-			read _choice
-			if [ "X$_choice" = "X" ]; then
-				_choice="$EDITOR"
-				_forceloop="$_choice"
-			else
-				for _editor in $EDITORS; do
-					if [ "X$_choice" = "X$_editor" ]; then
-						_forceloop="$_choice"
-						break
-					fi
-				done
-			fi
-			if [ "X$_forceloop" != "X" -a ! \( -x $EDITBIN/$_choice
-						-o -x $EDITUBIN/$_choice \) ]
-			then
-				_forceloop=""
-			fi
-			if [ "X$_forceloop" = "X" ]; then
-				echo "Sorry, $_choice isn't available."
-				_forceloop=""
-			fi
-		done
-		EDITOR="$_choice"
-	fi
-	export EDITOR
-
-	# pull in the functions that people will use from the shell prompt.
-	. /.commonutils
-	. /.instutils
-
-	echo "Follow the installation directions to install the OpenBSD"
-	echo "distribution sets."
-fi
diff --git a/distrib/sparc/floppies/upgr/dot.profile b/distrib/sparc/floppies/upgr/dot.profile
deleted file mode 100644
index abcb0d812d5..00000000000
--- a/distrib/sparc/floppies/upgr/dot.profile
+++ /dev/null
@@ -1,120 +0,0 @@
-#       $OpenBSD: dot.profile,v 1.5 2000/01/30 01:21:22 deraadt 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 HISTFILE=/.sh_history
-
-umask 022
-
-set -o emacs # emacs-style command line editing
-alias dmesg="cat /kern/msgbuf"
-
-# XXX
-# the TERM/EDITOR stuff is really well enough parameterized to be moved
-# into install.sub where it could use the routines there and be invoked
-# from the various (semi) MI install and upgrade scripts
-
-# terminals believed to be in termcap, default TERM
-TERMS="sun vt100 dumb"
-TERM=sun
-
-# editors believed to be in $EDITBIN, smart and dumb defaults
-EDITORS="ed"
-EDITOR=ed
-DUMB=ed
-EDITBIN=/bin
-
-if [ "X${DONEPROFILE}" = "X" ]; then
-	DONEPROFILE=YES
-
-	# mount kernfs and re-mount the boot media (perhaps r/w)
-	mount_kernfs /kern /kern
-	mount_ffs -o update /kern/rootdev /
-
-	# set up some sane defaults
-	echo 'erase ^H, werase ^W, kill ^U, intr ^C'
-	stty newcrt werase ^W intr ^C kill ^U erase ^H 9600
-
-	# get the terminal type
-	_forceloop=""
-	while [ "X$_forceloop" = X"" ]; do
-		echo "Supported terminals are: $TERMS"
-		eval `tset -s -m ":?$TERM"`
-		if [ "X$TERM" != X"unknown" ]; then
-			_forceloop="done"
-		fi
-	done
-	export TERM
-
-	# get the editor preference
-	if [ "X$TERM" = "Xdumb" -o "X$TERM" = "Xunknown" ]; then
-		echo -n "$TERM can't handle $EDITOR"
-		EDITOR="$DUMB"
-		echo ", using $EDITOR as text editor!"
-	elif [ "X$EDITOR" = "X$EDITORS" ]; then
-		echo "Only one editor available, you get to use $EDITOR!"
-	else
-		_forceloop=""
-		while [ "X$_forceloop" = X"" ]; do
-			echo "Supported editors are: $EDITORS"
-			echo -n "text editor? [$EDITOR] "
-			read _choice
-			if [ "X$_choice" = "X" ]; then
-				_choice="$EDITOR"
-				_forceloop="$_choice"
-			else
-				for _editor in $EDITORS; do
-					if [ "X$_choice" = "X$_editor" ]; then
-						_forceloop="$_choice"
-						break
-					fi
-				done
-			fi
-			if [ "X$_forceloop" != "X" -a ! -x $EDITBIN/$_choice ]
-			then
-				_forceloop=""
-			fi
-			if [ "X$_forceloop" = "X" ]; then
-				echo "Sorry, $_choice isn't available."
-				_forceloop=""
-			fi
-		done
-		EDITOR="$_choice"
-	fi
-	export EDITOR
-
-	# pull in the functions that people will use from the shell prompt.
-	. /.commonutils
-	. /.upgrutils
-
-	# run the upgrade script.
-	upgrade
-fi
diff --git a/distrib/sparc/floppies/upgr/dot.upgrutils b/distrib/sparc/floppies/upgr/dot.upgrutils
deleted file mode 100644
index 06b93eabc42..00000000000
--- a/distrib/sparc/floppies/upgr/dot.upgrutils
+++ /dev/null
@@ -1,57 +0,0 @@
-#	$OpenBSD: dot.upgrutils,v 1.2 1996/04/25 21:31:32 niklas 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.
-
-# Upgrade cleanup utilites (functions), to make sure a recently-upgraded
-# system is safely runnable.  These are meant to be invoked from the shell
-# prompt, by people installing OpenBSD.
-
-Cleanup()
-{
-	upgrade_dir=/
-
-	if [ ! -f /etc/fstab ]; then
-		upgrade_dir=/mnt
-	fi
-
-	echo	"Cleaning up miscellaneous files in /etc..."
-	mv $upgrade_dir/etc/rc.bak $upgrade_dir/etc/rc
-	chroot $upgrade_dir /usr/sbin/pwd_mkdb -p /etc/master.passwd
-	chroot $upgrade_dir /bin/rm /etc/sendmail.fc > /dev/null 2>&1
-	sync
-	echo	"Done."
-
-	echo	""
-	echo	"All that's left to do now is to install a new OpenBSD kernel"
-	echo	"on your hard disk.  You should now halt your machine using"
-	echo	"the 'halt' command.  Once the machine is halted, replace the"
-	echo	"installation floppy with the kernel-copy floppy and hit any"
-	echo	"key to reboot.  Use the kernel-copy floppy to copy a kernel"
-	echo	"to your hard disk."
-}
diff --git a/distrib/sparc/floppies/upgr/list b/distrib/sparc/floppies/upgr/list
deleted file mode 100644
index bf8911a25f9..00000000000
--- a/distrib/sparc/floppies/upgr/list
+++ /dev/null
@@ -1,8 +0,0 @@
-#	$OpenBSD: list,v 1.2 1997/05/01 11:30:59 niklas Exp $
-
-# and the upgrade tools
-COPY	dot.profile			.profile
-COPY	dot.upgrutils			.upgrutils
-COPY	upgrade.sh			upgrade
-COPY	dot.hdprofile			tmp/.hdprofile
-SPECIAL	chmod 755 upgrade
diff --git a/distrib/sparc/floppies/upgr/upgrade.sh b/distrib/sparc/floppies/upgr/upgrade.sh
deleted file mode 100644
index 6d587a41e30..00000000000
--- a/distrib/sparc/floppies/upgr/upgrade.sh
+++ /dev/null
@@ -1,261 +0,0 @@
-#!/bin/sh
-#	$OpenBSD: upgrade.sh,v 1.4 1997/05/11 22:47:34 grr 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.
-
-#	OpenBSD upgrade script.
-#	In a perfect world, this would be a nice C program, with a reasonable
-#	user interface.
-
-DT=/etc/disktab				# /etc/disktab
-FSTABDIR=/mnt/etc			# /mnt/etc
-#DONTDOIT=echo
-
-VERSION=1.0
-FSTAB=${FSTABDIR}/fstab
-
-getresp() {
-	read resp
-	if [ "X$resp" = "X" ]; then
-		resp=$1
-	fi
-}
-
-echo	"Welcome to the OpenBSD ${VERSION} upgrade program."
-echo	""
-echo	"This program is designed to help you put the new version of OpenBSD"
-echo	"on your hard disk, in a simple and rational way.  To upgrade, you"
-echo	"must have plenty of free space on all partitions which will be"
-echo	"upgraded.  If you have at least 1MB free on your root partition,"
-echo	"and several free on your /usr patition, you should be fine."
-echo	""
-echo	"As with anything which modifies your hard drive's contents, this"
-echo	"program can cause SIGNIFICANT data loss, and you are advised"
-echo	"to make sure your hard drive is backed up before beginning the"
-echo	"upgrade process."
-echo	""
-echo	"Default answers are displyed in brackets after the questions."
-echo	"You can hit Control-C at any time to quit, but if you do so at a"
-echo	"prompt, you may have to hit return.  Also, quitting in the middle of"
-echo	"the upgrade may leave your system in an inconsistent (and unusable)"
-echo	"state."
-echo	""
-echo -n "Proceed with upgrade? [n] "
-getresp "n"
-case "$resp" in
-	y*|Y*)
-		echo	"Cool!  Let's get to it..."
-		;;
-	*)
-		echo	""
-		echo	"OK, then.  Enter 'halt' at the prompt to halt the"
-		echo	"machine.  Once the machine has halted, remove the"
-		echo	"floppy and press any key to reboot."
-		exit
-		;;
-esac
-
-# find out what units are possible, and query the user.
-driveunits=`ls /dev/[sw]d?a | sed -e 's,/dev/\(...\)a,\1,g'`
-if [ "X${driveunits}" = "X" ]; then
-	echo	"FATAL ERROR:"
-	echo	"No disk devices."
-	echo	"This is probably a bug in the install disks."
-	echo	"Exiting install program."
-	exit
-fi
-
-echo	""
-echo	"The following disks are supported by this upgrade procedure:"
-echo	"	"${driveunits}
-echo	"If your system was previously completely contained within the"
-echo	"disks listed above (i.e. if your system didn't occupy any space"
-echo	"on disks NOT listed above), this upgrade disk can upgrade your"
-echo	"system.  If it cannot, hit Control-C at the prompt."
-echo	""
-while [ "X${drivename}" = "X" ]; do
-	echo -n	"Which disk contains your root partion? "
-	getresp
-	otherdrives=`echo "${driveunits}" | sed -e s,${resp},,`
-	if [ "X${driveunits}" = "X${otherdrives}" ]; then
-		echo	""
-		echo	"\"${resp}\" is an invalid drive name.  Valid choices"
-		echo	"are: "${driveunits}
-		echo	""
-	else
-		drivename=${resp}
-	fi
-done
-
-echo	""
-echo	"Root partition is on ${drivename}a."
-
-echo	""
-echo	"Would you like to upgrade your file systems to the new file system"
-echo -n	"format? [y] "
-getresp "y"
-case "$resp" in
-	n*|N*)
-		echo	""
-		echo	"You should upgrade your file systems with 'fsck -c 2'"
-		echo	"as soon as is feasible, because the new file system"
-		echo	"code is better-tested and more performant."
-		upgradefs=NO
-		;;
-	*)
-		upgradefs=YES
-		;;
-esac
-
-if [ $upgradefs = YES ]; then
-	echo	""
-	echo	"Upgrading the file system on ${drivename}a..."
-	
-	fsck -p -c 2 /dev/r${drivename}a
-	if [ $? != 0 ]; then
-		echo	"FATAL ERROR: FILE SYSTEM UPGRADE FAILED."
-		echo	"You should probably reboot the machine, fsck your"
-		echo	"disk(s), and try the upgrade procedure again."
-		exit 1
-	fi
-	echo	"Done."
-fi
-
-echo	""
-echo	"Mounting root partition on /mnt..."
-mount /dev/${drivename}a /mnt
-if [ $? != 0 ]; then
-	echo	"FATAL ERROR: MOUNT FAILED."
-	echo	"You should verify that your system is set up as you"
-	echo	"described, and re-attempt the upgrade procedure."
-	exit 1
-fi
-echo	"Done."
-
-if [ $upgradefs = YES ]; then
-	echo	""
-	echo -n	"Copying new fsck binary to your hard disk..."
-	if [ ! -d /mnt/sbin ]; then
-		mkdir /mnt/sbin
-	fi
-	cp /sbin/fsck /mnt/sbin/fsck
-	if [ $? != 0 ]; then
-		echo	"FATAL ERROR: COPY FAILED."
-		echo	"It in unclear why this error would occur.  It looks"
-		echo	"like you may end up having to upgrade by hand."
-		exit 1
-	fi
-	echo	" Done."
-
-	echo	""
-	echo    "Re-mounting root partition read-only..."
-	mount -u -o ro /dev/${drivename}a /mnt
-	if [ $? != 0 ]; then
-		echo	"FATAL ERROR: RE-MOUNT FAILED."
-		echo	"It in unclear why this error would occur.  It looks"
-		echo	"like you may end up having to upgrade by hand."
-		exit 1
-	fi
-	echo	"Done."
-
-	echo	""
-	echo	"Upgrading the rest of your file systems..."
-	chroot /mnt fsck -p -c 2
-	if [ $? != 0 ]; then
-		echo	"FATAL ERROR: FILE SYSTEM UPGRADE(S) FAILED."
-		echo	"You should probably reboot the machine, fsck your"
-		echo	"file system(s), and try the upgrade procedure"
-		echo	"again."
-		exit 1
-	fi
-	echo	"Done."
-
-	echo	""
-	echo    "Re-mounting root partition read-write..."
-	mount -u -o rw /dev/${drivename}a /mnt
-	if [ $? != 0 ]; then
-		echo	"FATAL ERROR: RE-MOUNT FAILED."
-		echo	"It in unclear why this error would occur.  It looks"
-		echo	"like you may end up having to upgrade by hand."
-		exit 1
-	fi
-	echo	"Done."
-fi
-
-echo	""
-echo	"Updating disk labels on ${drivename}..."
-$DONTDOIT disklabel $drivename > /mnt/tmp/${drivename}.label
-if [ $? != 0 ]; then
-	echo	"FATAL ERROR: READ OF DISK LABEL FAILED."
-	echo	"It in unclear why this error would occur.  It looks"
-	echo	"like you may end up having to upgrade by hand."
-	exit 1
-fi
-$DONTDOIT disklabel -R $drivename /mnt/tmp/${drivename}.label
-
-echo	"Updating boot blodk on ${drivename}..."
-$DONTDOIT /usr/mdec/binstall -v ffs /mnt
-if [ $? != 0 ]; then
-	echo	"FATAL ERROR: UPDATE OF BOOT BLOCKS FAILED."
-	echo	"It in unclear why this error would occur.  It looks"
-	echo	"like you may end up having to upgrade by hand."
-	exit 1
-fi
-
-if [ -f /mnt/boot ]; then
-$DONTDOIT	rm -f /mnt/boot.bak
-$DONTDOIT	mv /mnt/boot /mnt/boot.bak
-fi
-
-echo	"Done."
-
-echo	""
-echo	"Copying bootstrapping binaries and config files to the hard drive..."
-$DONTDOIT cp /mnt/.profile /mnt/.profile.bak
-$DONTDOIT pax -rw -X -k . /mnt
-$DONTDOIT mv /mnt/etc/rc /mnt/etc/rc.bak
-$DONTDOIT cp /tmp/.hdprofile /mnt/.profile
-
-echo	""
-echo	"Mounting remaining partitions..."
-chroot /mnt mount -at ufs > /dev/null 2>&1
-echo	"Done."
-
-echo    ""
-echo    ""
-echo	"OK!  The preliminary work of setting up your disk is now complete,"
-echo	"and you can now upgrade the actual OpenBSD software."
-echo	""
-echo	"Right now, your hard disk is mounted on /mnt.  You should consult"
-echo	"the installation notes to determine how to load and install the new"
-echo	"OpenBSD distribution sets, and how to clean up after the upgrade"
-echo	"software, when you are done."
-echo	""
-echo	"GOOD LUCK!"
-echo	""