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

4 files changed, 9 insertions, 59 deletions

diff --git a/distrib/mac68k/ramdisk/dot.profile b/distrib/mac68k/ramdisk/dot.profile
index e35c71edf88..e428d561117 100644
--- a/distrib/mac68k/ramdisk/dot.profile
+++ b/distrib/mac68k/ramdisk/dot.profile
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: dot.profile,v 1.3 2000/10/25 16:38:13 millert Exp $
+#	$OpenBSD: dot.profile,v 1.4 2001/06/23 19:44:44 deraadt Exp $
 #	$NetBSD: dot.profile,v 1.1 1995/07/18 04:13:09 briggs Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
@@ -39,7 +39,6 @@ export HOME=/
 umask 022
 
 set -o emacs # emacs-style command line editing
-alias dmesg="cat /kern/msgbuf"
 
 TMPWRITEABLE=/tmp/writeable
 
@@ -53,7 +52,7 @@ if [ "X${DONEPROFILE}" = "X" ]; then
 	echo ''
 
 	echo 'Remounting /dev/rd0a as root...'
-	mount /dev/rd0a /
+	mount -u /dev/rd0a /
 
 	# tell install.md we've done it
 	> ${TMPWRITEABLE}
diff --git a/distrib/mac68k/ramdisk/install.md b/distrib/mac68k/ramdisk/install.md
index dfb1f63dc17..2f7b7d33b01 100644
--- a/distrib/mac68k/ramdisk/install.md
+++ b/distrib/mac68k/ramdisk/install.md
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$OpenBSD: install.md,v 1.4 2001/01/25 19:18:39 deraadt Exp $
+#	$OpenBSD: install.md,v 1.5 2001/06/23 19:44:44 deraadt Exp $
 #	$NetBSD: install.md,v 1.1.2.4 1996/08/26 15:45:14 gwr Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -44,9 +44,7 @@
 
 # Machine-dependent install sets
 MDSETS="kernel"
-
-TMPWRITEABLE=/tmp/writeable
-KERNFSMOUNTED=/tmp/kernfsmounted
+ARCH=
 
 md_set_term() {
 	echo -n "Specify terminal type [vt220]: "
@@ -69,56 +67,14 @@ md_set_term() {
 	fi
 }
 
-md_makerootwritable() {
-
-	if [ -e ${TMPWRITEABLE} ]
-	then
-		md_mountkernfs
-		return
-	fi
-	if ! mount -t ffs  -u /dev/rd0a / ; then
-		cat << \__rd0_failed_1
-
-FATAL ERROR: Can't mount the ram filesystem.
-
-__rd0_failed_1
-		exit
-	fi
-
-	# Bleh.  Give mount_mfs a chance to DTRT.
-	sleep 2
-	> ${TMPWRITEABLE}
-
-	md_mountkernfs
-}
-
-md_mountkernfs() {
-	if [ -e ${KERNFSMOUNTED} ]
-	then
-		return
-	fi
-	if ! mount -t kernfs /kern /kern
-	then
-		cat << \__kernfs_failed_1
-FATAL ERROR: Can't mount kernfs filesystem
-__kernfs_failed_1
-		exit
-	fi
-	> ${KERNFSMOUNTED} 
-}
-
-md_machine_arch() {
-	cat /kern/machine
-}
-
 md_get_diskdevs() {
 	# return available disk devices
-	egrep -a "^sd[0-9]+ " /kern/msgbuf | cutword 1 | sort -u
+	dmesg | egrep -a "^sd[0-9]+ " | cutword 1 | sort -u
 }
 
 md_get_cddevs() {
 	# return available CD-ROM devices
-	egrep -a "^cd[0-9]+ " /kern/msgbuf | cutword 1 | sort -u
+	dmesg | egrep -a "^cd[0-9]+ " | cutword 1 | sort -u
 }
 
 md_get_partition_range() {
diff --git a/distrib/mac68k/ramdisk/list b/distrib/mac68k/ramdisk/list
index a082c70065c..c55cd9e3254 100644
--- a/distrib/mac68k/ramdisk/list
+++ b/distrib/mac68k/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.3 2000/07/15 02:21:00 deraadt Exp $
+#	$OpenBSD: list,v 1.4 2001/06/23 19:44:45 deraadt Exp $
 
 COPY	${OBJDIR}/raminst		raminst
 LINK	raminst			bin/cat
@@ -76,7 +76,7 @@ SPECIAL	sed -e '/^#[ 	].*$/d' < ${TOPDIR}/common/termcap.vt > usr/share/misc/ter
 # and the installation tools
 SPECIAL	sed -e '/^#[ 	].*$/d' < ${CURDIR}/dot.profile > .profile
 SPECIAL	sed -e '/^#[ 	].*$/d' < ${CURDIR}/dot.instutils > .instutils
-SPECIAL	sed -e '/^#[ 	].*$/d' < ${CURDIR}/install.md > install.md
+SPECIAL sed -e '/^#[ 	].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/../install.md > install.md
 SPECIAL	sed -e '/^#[ 	].*$/d' < ${CURDIR}/../../miniroot/install.sh > install
 SPECIAL	sed -e '/^#[ 	].*$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade
 SPECIAL	sed -e "/^VERSION=/s/=.*/=${REV}/" -e '/^#[ 	].*$/d' < ${CURDIR}/../../miniroot/install.sub > install.sub
diff --git a/distrib/mac68k/ramdisk/mtree.conf b/distrib/mac68k/ramdisk/mtree.conf
index 36fc71719a3..cf713eab1f6 100644
--- a/distrib/mac68k/ramdisk/mtree.conf
+++ b/distrib/mac68k/ramdisk/mtree.conf
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: mtree.conf,v 1.1 1999/06/13 10:33:31 downsj Exp $
+#	$OpenBSD: mtree.conf,v 1.2 2001/06/23 19:44:45 deraadt Exp $
 #	$NetBSD: mtree.conf,v 1.1 1995/07/18 04:13:24 briggs Exp $
 #
 
@@ -42,11 +42,6 @@ tmp
 # ./tmp
 ..
 
-# ./kern
-kern
-# ./kern
-..
-
 # ./var
 var