argh. stop using kernfs, using dmesg using sysctl. encode ARCH into

install.md at build time.  remove some crud.  and the icing on the cake:
skip testing all this until next week

5 files changed, 12 insertions, 56 deletions

diff --git a/distrib/sun3/install.md b/distrib/sun3/install.md
index eacc2d89fd4..778274e1314 100644
--- a/distrib/sun3/install.md
+++ b/distrib/sun3/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.1 2000/06/20 21:29:03 miod Exp $
+#	$OpenBSD: install.md,v 1.2 2001/06/23 19:44:59 deraadt Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -41,22 +41,8 @@
 #
 
 # Machine-dependent install sets
-MSGBUF=/kern/msgbuf
-HOSTNAME=/kern/hostname
 MDSETS="kernel"
-
-# an alias for hostname(1)
-hostname() {
-	if [ -x /bin/hostname ]; then
-		/bin/hostname $1
-	else
-		if [ -z "$1" ]; then
-			cat $HOSTNAME
-		else
-			echo $1 > $HOSTNAME
-		fi
-	fi
-}
+ARCH=ARCH
 
 md_set_term() {
 	test -n "$TERM" && return
@@ -66,30 +52,10 @@ md_set_term() {
 	export TERM
 }
 
-md_makerootwritable() {
-	# Was: do_mfs_mount "/tmp" "2048"
-	# /tmp is the mount point
-	# 2048 is the size in DEV_BIZE blocks
-
-	if [ ! -w /tmp ]; then
-		umount /tmp > /dev/null 2>&1
-		if ! mount_mfs -s 2048 swap /tmp ; then
-			cat << __EOT
-
-FATAL ERROR: Can't mount the memory filesystem.
-
-__EOT
-			exit
-		fi
-
-		# Bleh.  Give mount_mfs a chance to DTRT.
-		sleep 2
-	fi
-}
-
 md_get_msgbuf() {
-        # Only want to see one boot's worth of info
-        sed -n -f /dev/stdin $MSGBUF <<- OOF
+	# Only want to see one boot's worth of info
+	dmesg > /tmp/msgbuf
+	sed -n -f /dev/stdin /tmp/msgbuf <<- OOF
                 /^OpenBSD /h
                 /^OpenBSD /!H
                 \${
@@ -99,10 +65,6 @@ md_get_msgbuf() {
 	OOF
 }
 
-md_machine_arch() {
-	cat /kern/machine
-}
-
 md_get_diskdevs() {
 	# return available disk devices
 	md_get_msgbuf | sed -n 	-e '/^sd[0-9] /{s/ .*//;p;}' \
diff --git a/distrib/sun3/miniroot/dot.profile b/distrib/sun3/miniroot/dot.profile
index e2cae145379..125008c2373 100644
--- a/distrib/sun3/miniroot/dot.profile
+++ b/distrib/sun3/miniroot/dot.profile
@@ -1,4 +1,4 @@
-#	$OpenBSD: dot.profile,v 1.2 2000/10/25 16:38:14 millert Exp $
+#	$OpenBSD: dot.profile,v 1.3 2001/06/23 19:45:00 deraadt Exp $
 #
 # Copyright (c) 1995 Jason R. Thorpe
 # Copyright (c) 1994 Christopher G. Demetriou
@@ -36,7 +36,6 @@ 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
@@ -50,9 +49,7 @@ TERM=sun
 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 /
+	mount_ffs -o update /dev/rd0a /
 
 	# set up some sane defaults
 	echo 'erase ^?, werase ^W, kill ^U, intr ^C, status ^T'
diff --git a/distrib/sun3/miniroot/list b/distrib/sun3/miniroot/list
index eb20e213ac8..bca9da60c26 100644
--- a/distrib/sun3/miniroot/list
+++ b/distrib/sun3/miniroot/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.2 2000/07/13 01:41:45 miod Exp $
+#	$OpenBSD: list,v 1.3 2001/06/23 19:45:00 deraadt Exp $
 
 # Sun3 extras
 LINK	instbin			sbin/disklabel
@@ -51,6 +51,6 @@ SYMLINK	/tmp/hosts			etc/hosts
 
 # and the installation tools
 COPY	${ARCHDIR}/dot.profile		.profile
-COPY	${ARCHDIR}/../install.md	install.md
+SPECIAL sed -e '/^#[ 	].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch`" < ${CURDIR}/../common/install.md	 > install.md
 COPY	${DESTDIR}/usr/mdec/ufsboot	boot
 SPECIAL sync; ${DESTDIR}/usr/mdec/installboot ${TARGDIR}/boot ${DESTDIR}/usr/mdec/bootxx /dev/rsvnd0c
diff --git a/distrib/sun3/ramdisk/dot.profile b/distrib/sun3/ramdisk/dot.profile
index cb2c5ab611e..6ce0b67c4bc 100644
--- a/distrib/sun3/ramdisk/dot.profile
+++ b/distrib/sun3/ramdisk/dot.profile
@@ -1,4 +1,4 @@
-#	$OpenBSD: dot.profile,v 1.3 2000/10/25 16:38:14 millert Exp $
+#	$OpenBSD: dot.profile,v 1.4 2001/06/23 19:45:01 deraadt Exp $
 #
 # Copyright (c) 1995 Jason R. Thorpe
 # Copyright (c) 1994 Christopher G. Demetriou
@@ -36,7 +36,6 @@ 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
@@ -50,8 +49,6 @@ TERM=sun
 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 /dev/rd0a /
 
 	# set up some sane defaults
diff --git a/distrib/sun3/ramdisk/list b/distrib/sun3/ramdisk/list
index bc314cd0cb6..dad8f698f01 100644
--- a/distrib/sun3/ramdisk/list
+++ b/distrib/sun3/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.4 2000/07/13 01:41:49 miod Exp $
+#	$OpenBSD: list,v 1.5 2001/06/23 19:45:01 deraadt Exp $
 
 # Sun3 extra's
 LINK	instbin			sbin/disklabel
@@ -35,4 +35,4 @@ SYMLINK	/tmp/hosts			etc/hosts
 
 # and the installation tools
 COPY	${ARCHDIR}/../ramdisk/dot.profile	.profile
-COPY	${ARCHDIR}/../install.md	install.md
+SPECIAL sed -e '/^#[ 	].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/../common/install.md	 > install.md