summaryrefslogtreecommitdiff
path: root/distrib/powerpc
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2001-06-23 19:45:04 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2001-06-23 19:45:04 +0000
commitd83f5786ed940c67fb7d66cc4945a1b84f6279af (patch)
tree7eb4382f0b4f8a5b9b50615f865e3fffb407de80 /distrib/powerpc
parent12ce374fe89e95dea19bb150c4921a44f38e2b67 (diff)
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
Diffstat (limited to 'distrib/powerpc')
-rw-r--r--distrib/powerpc/ramdisk/dot.profile5
-rw-r--r--distrib/powerpc/ramdisk/install.md23
-rw-r--r--distrib/powerpc/ramdisk/list4
-rw-r--r--distrib/powerpc/ramdisk/mtree.conf7
4 files changed, 8 insertions, 31 deletions
diff --git a/distrib/powerpc/ramdisk/dot.profile b/distrib/powerpc/ramdisk/dot.profile
index 5f90def1cbb..f527ff43e44 100644
--- a/distrib/powerpc/ramdisk/dot.profile
+++ b/distrib/powerpc/ramdisk/dot.profile
@@ -1,4 +1,4 @@
-# $OpenBSD: dot.profile,v 1.5 2000/10/25 16:38:16 millert Exp $
+# $OpenBSD: dot.profile,v 1.6 2001/06/23 19:44:54 deraadt Exp $
#
# Copyright (c) 1994 Christopher G. Demetriou
# All rights reserved.
@@ -36,13 +36,10 @@ export HOME=/
umask 022
set -o emacs # emacs-style command line editing
-alias dmesg="cat /kern/msgbuf"
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/powerpc/ramdisk/install.md b/distrib/powerpc/ramdisk/install.md
index 0e77bea7239..69ffa16630d 100644
--- a/distrib/powerpc/ramdisk/install.md
+++ b/distrib/powerpc/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.24 2001/04/17 13:06:24 brad Exp $
+# $OpenBSD: install.md,v 1.25 2001/06/23 19:44:54 deraadt Exp $
#
#
# Copyright rc) 1996 The NetBSD Foundation, Inc.
@@ -42,6 +42,7 @@
# Machine-dependent install sets
MDSETS="kernel"
+ARCH=ARCH
md_set_term() {
test -n "$TERM" && return
@@ -51,22 +52,14 @@ md_set_term() {
export TERM
}
-md_makerootwritable() {
- :
-}
-
-md_machine_arch() {
- cat /kern/machine
-}
-
md_get_diskdevs() {
# return available disk devices
- bsort `cat /kern/msgbuf | egrep -a "^[sw]d[0-9]+ " | cutword 1`
+ bsort `dmesg | egrep -a "^[sw]d[0-9]+ " | cutword 1`
}
md_get_cddevs() {
# return available CDROM devices
- bsort `cat /kern/msgbuf | egrep -a "^cd[0-9]+ " | cutword 1`
+ bsort `dmesg | egrep -a "^cd[0-9]+ " | cutword 1`
}
md_get_partition_range() {
@@ -444,11 +437,3 @@ has rebooted, use Open Firmware to boot into OpenBSD.
__EOT
}
-
-hostname() {
- case $# in
- 0) cat /kern/hostname ;;
- 1) echo "$1" > /kern/hostname ;;
- *) echo usage: hostname [name-of-host]
- esac
-}
diff --git a/distrib/powerpc/ramdisk/list b/distrib/powerpc/ramdisk/list
index 0aa9647fc77..9b4ed17c5fc 100644
--- a/distrib/powerpc/ramdisk/list
+++ b/distrib/powerpc/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.19 2001/04/17 05:49:03 drahn Exp $
+# $OpenBSD: list,v 1.20 2001/06/23 19:44:54 deraadt Exp $
SRCDIRS distrib/special
SRCDIRS usr.bin bin sbin usr.sbin gnu/usr.bin
@@ -94,7 +94,7 @@ COPY ${TOPDIR}/common/termcap.vt usr/share/misc/termcap
# and the installation tools
COPY dot.profile .profile
-COPY install.md install.md
+SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/install.md > install.md
COPY ${CURDIR}/../../miniroot/install.sh install
COPY ${CURDIR}/../../miniroot/upgrade.sh upgrade
#SPECIAL sed "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/install.sub > install.sub
diff --git a/distrib/powerpc/ramdisk/mtree.conf b/distrib/powerpc/ramdisk/mtree.conf
index df3224319c6..3ba422240e0 100644
--- a/distrib/powerpc/ramdisk/mtree.conf
+++ b/distrib/powerpc/ramdisk/mtree.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: mtree.conf,v 1.3 2001/03/25 06:30:41 drahn Exp $
+# $OpenBSD: mtree.conf,v 1.4 2001/06/23 19:44:54 deraadt Exp $
/set type=dir uname=root gname=wheel mode=0755
# .
@@ -30,11 +30,6 @@ mnt2
# ./mnt2
..
-# ./kern
-kern
-# ./kern
-..
-
# ./sbin
sbin
# ./sbin