summaryrefslogtreecommitdiff
path: root/distrib/mvme88k
diff options
context:
space:
mode:
Diffstat (limited to 'distrib/mvme88k')
-rw-r--r--distrib/mvme88k/miniroot/dot.profile7
-rw-r--r--distrib/mvme88k/miniroot/list4
-rw-r--r--distrib/mvme88k/ramdisk/dot.profile3
-rw-r--r--distrib/mvme88k/ramdisk/install.md53
-rw-r--r--distrib/mvme88k/ramdisk/install.sh8
-rw-r--r--distrib/mvme88k/ramdisk/list4
-rw-r--r--distrib/mvme88k/ramdisk/mtree.conf7
7 files changed, 13 insertions, 73 deletions
diff --git a/distrib/mvme88k/miniroot/dot.profile b/distrib/mvme88k/miniroot/dot.profile
index 2098da8bba8..af1d6f34ce2 100644
--- a/distrib/mvme88k/miniroot/dot.profile
+++ b/distrib/mvme88k/miniroot/dot.profile
@@ -1,4 +1,4 @@
-# $OpenBSD: dot.profile,v 1.3 2000/10/25 16:38:16 millert Exp $
+# $OpenBSD: dot.profile,v 1.4 2001/06/23 19:44:48 deraadt Exp $
# $NetBSD: dot.profile,v 1.1 1995/12/18 22:54:43 pk Exp $
#
# Copyright (c) 1995 Jason R. Thorpe
@@ -37,7 +37,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
@@ -58,9 +57,7 @@ EDITUBIN=/usr/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 /
+ mount_ffs -o update /dev/rd0a /
# set up some sane defaults
echo 'erase ^H, werase ^W, kill ^U, intr ^C, status ^T'
diff --git a/distrib/mvme88k/miniroot/list b/distrib/mvme88k/miniroot/list
index b4e2417d404..1d41f3dd1a5 100644
--- a/distrib/mvme88k/miniroot/list
+++ b/distrib/mvme88k/miniroot/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.2 1998/12/20 23:36:43 millert Exp $
+# $OpenBSD: list,v 1.3 2001/06/23 19:44:48 deraadt Exp $
# $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
# Amiga extra's
@@ -39,4 +39,4 @@ 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`" < ${ARCHDIR}/../install.md > install.md
diff --git a/distrib/mvme88k/ramdisk/dot.profile b/distrib/mvme88k/ramdisk/dot.profile
index cf72a5e32fe..16c9394aeb9 100644
--- a/distrib/mvme88k/ramdisk/dot.profile
+++ b/distrib/mvme88k/ramdisk/dot.profile
@@ -1,5 +1,5 @@
#
-# $OpenBSD: dot.profile,v 1.3 2000/10/25 16:38:17 millert Exp $
+# $OpenBSD: dot.profile,v 1.4 2001/06/23 19:44:49 deraadt Exp $
#
# Copyright (c) 1994 Christopher G. Demetriou
# All rights reserved.
@@ -37,7 +37,6 @@ export TERM=vt200
umask 022
set -o emacs # emacs-style command line editing
-alias dmesg="cat /kern/msgbuf"
# set up some sane defaults
echo 'erase ^?, werase ^H, kill ^U, intr ^C, status ^T'
diff --git a/distrib/mvme88k/ramdisk/install.md b/distrib/mvme88k/ramdisk/install.md
index a070ad5d7d8..271ce9a47f9 100644
--- a/distrib/mvme88k/ramdisk/install.md
+++ b/distrib/mvme88k/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.6 2001/01/25 19:18:40 deraadt Exp $
+# $OpenBSD: install.md,v 1.7 2001/06/23 19:44:49 deraadt Exp $
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
#
@@ -39,9 +39,6 @@
#
#
-TMPWRITEABLE=/tmp/writeable
-KERNFSMOUNTED=/tmp/kernfsmounted
-
md_set_term() {
if [ ! -z "$TERM" ]; then
return
@@ -52,21 +49,17 @@ md_set_term() {
export TERM
}
-md_machine_arch() {
- cat /kern/machine
-}
-
md_get_diskdevs() {
- egrep -a "^sd[0-9] " < /kern/msgbuf
+ dmesg | egrep -a "^sd[0-9] "
}
md_get_cddevs() {
- egrep -a "^cd[0-9] " < /kern/msgbuf
+ dmesg | egrep -a "^cd[0-9] "
}
md_get_ifdevs() {
# return available network devices
- egrep "(^ie[0-9] )|(^le[0-9] )"< /kern/msgbuf | cut -d" " -f1 | sort -u
+ dmesg | egrep "(^ie[0-9] )|(^le[0-9] )" | cut -d" " -f1 | sort -u
}
md_get_partition_range() {
@@ -244,41 +237,3 @@ __congratulations_1
md_native_fstype() {
}
-
-md_makerootwritable() {
-
- if [ -e ${TMPWRITEABLE} ]
- then
- md_mountkernfs
- return
- fi
- umount /tmp >> /dev/null 2>&1
- 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}
-}
diff --git a/distrib/mvme88k/ramdisk/install.sh b/distrib/mvme88k/ramdisk/install.sh
index ec6e73ee274..06ae7dc704f 100644
--- a/distrib/mvme88k/ramdisk/install.sh
+++ b/distrib/mvme88k/ramdisk/install.sh
@@ -1,5 +1,5 @@
#
-# $OpenBSD: install.sh,v 1.2 2000/01/24 04:51:55 smurph Exp $
+# $OpenBSD: install.sh,v 1.3 2001/06/23 19:44:49 deraadt Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -62,7 +62,6 @@ MODE="install"
# md_congrats() - display friendly message
# md_native_fstype() - native filesystem type for disk installs
# md_native_fsopts() - native filesystem options for disk installs
-# md_makerootwritable() - make root writable (at least /tmp)
# include machine dependent subroutines
. install.md
@@ -96,11 +95,6 @@ md_set_term
# Get timezone info
get_timezone
-# Make sure we can write files (at least in /tmp)
-# This might make an MFS mount on /tmp, or it may
-# just re-mount the root with read-write enabled.
-md_makerootwritable
-
# Install the shadowed disktab file; lets us write to it for temporary
# purposes without mounting the miniroot read-write.
cp /etc/disktab.shadow /tmp/disktab.shadow
diff --git a/distrib/mvme88k/ramdisk/list b/distrib/mvme88k/ramdisk/list
index 0d7a241bd0b..292c5cf7dc8 100644
--- a/distrib/mvme88k/ramdisk/list
+++ b/distrib/mvme88k/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.4 2000/07/14 20:46:57 deraadt Exp $
+# $OpenBSD: list,v 1.5 2001/06/23 19:44:50 deraadt Exp $
COPY ${OBJDIR}/raminst raminst
LINK raminst bin/cat
@@ -86,7 +86,7 @@ LINK sbin/init usr/bin/vi
COPY dot.profile .profile
COPY dot.instutils .instutils
COPY install.sh install
-COPY install.md install.md
+SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/install.md > install.md
COPY install.sub install.sub
COPY disktab.shadow etc/disktab.shadow
COPY ${DESTDIR}/usr/mdec/installboot usr/mdec
diff --git a/distrib/mvme88k/ramdisk/mtree.conf b/distrib/mvme88k/ramdisk/mtree.conf
index 2496928f236..eaf11101c3f 100644
--- a/distrib/mvme88k/ramdisk/mtree.conf
+++ b/distrib/mvme88k/ramdisk/mtree.conf
@@ -1,5 +1,5 @@
#
-# $OpenBSD: mtree.conf,v 1.1 1998/12/17 02:16:33 smurph Exp $
+# $OpenBSD: mtree.conf,v 1.2 2001/06/23 19:44:50 deraadt Exp $
#
/set type=dir uname=root gname=wheel mode=0755
@@ -41,11 +41,6 @@ tmp
# ./tmp
..
-# ./kern
-kern
-# ./kern
-..
-
# ./usr
usr
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 14:50:23 +0000