diff options
Diffstat (limited to 'distrib/vax')
-rw-r--r-- | distrib/vax/install.md | 48 | ||||
-rw-r--r-- | distrib/vax/ramdisk/dot.profile | 7 | ||||
-rw-r--r-- | distrib/vax/ramdisk/list | 4 |
3 files changed, 9 insertions, 50 deletions
diff --git a/distrib/vax/install.md b/distrib/vax/install.md index c1ad6aca15e..29dbbd5c94e 100644 --- a/distrib/vax/install.md +++ b/distrib/vax/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.1 2001/02/24 10:55:02 hugh Exp $ +# $OpenBSD: install.md,v 1.2 2001/06/23 19:45:01 deraadt Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -42,22 +42,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 @@ -67,30 +53,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 \${ @@ -100,10 +66,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/vax/ramdisk/dot.profile b/distrib/vax/ramdisk/dot.profile index bb4f8bacd15..b898df54184 100644 --- a/distrib/vax/ramdisk/dot.profile +++ b/distrib/vax/ramdisk/dot.profile @@ -1,4 +1,4 @@ -# $OpenBSD: dot.profile,v 1.2 2001/03/16 04:50:36 hugh Exp $ +# $OpenBSD: dot.profile,v 1.3 2001/06/23 19:45:02 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 @@ -51,9 +50,7 @@ TERM=vt100 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' diff --git a/distrib/vax/ramdisk/list b/distrib/vax/ramdisk/list index 5e8f58a0ee8..e1c3bf136a1 100644 --- a/distrib/vax/ramdisk/list +++ b/distrib/vax/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.2 2001/03/16 04:50:36 hugh Exp $ +# $OpenBSD: list,v 1.3 2001/06/23 19:45:03 deraadt Exp $ # $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $ # extras @@ -41,4 +41,4 @@ SYMLINK /tmp/hosts etc/hosts # and the installation tools COPY ${ARCHDIR}/../miniroot/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 |