summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2007-05-28 02:57:12 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2007-05-28 02:57:12 +0000
commitfb8f5970cfe17b111ba5da2dec48a5d5c29f79ca (patch)
treede6562ad3622ac11a12e04f759bce2f5e3a95fc0
parentc85ba1681f914a786dcbc55caa48005c1def4173 (diff)
Don't look for wt tape devices while installing.
-rw-r--r--distrib/miniroot/install.sub6
-rw-r--r--distrib/vax/install.md4
2 files changed, 5 insertions, 5 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 19d0b5701ca..4b374d4a81e 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.418 2007/04/27 02:41:41 deraadt Exp $
+# $OpenBSD: install.sub,v 1.419 2007/05/28 02:57:11 krw Exp $
# $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
#
# Copyright (c) 1997-2007 Todd Miller, Theo de Raadt, Ken Westerback
@@ -73,7 +73,7 @@
# MDTERM - 'vt220' assumed if not provided
# MDDKDEVS - '/^[sw]d[0-9][0-9]* /s/ .*//p' assumed if not provided
# MDCDDEVS - '/^cd[0-9][0-9]* /s/ .*//p' assumed if not provided
-# MDMTDEVS - '/^[cmsw]t[0-9][0-9]* /s/ .*//p'
+# MDMTDEVS - '/^[cms]t[0-9][0-9]* /s/ .*//p'
# MDSERIAL - offer to configure a serial console
# MDXAPERTURE - set machdep.allowaperture=value in sysctl.conf
. install.md
@@ -1657,7 +1657,7 @@ dmesg | sed -ne '/^OpenBSD /h;/^OpenBSD /!H;${g;p;}' >/var/run/dmesg.boot
# Scan /var/run/dmesg.boot for interesting devices.
DKDEVS=$(scan_disknames "${MDDKDEVS:-/^[sw]d[0-9][0-9]* /s/ .*//p}")
CDDEVS=$(scan_disknames "${MDCDDEVS:-/^cd[0-9][0-9]* /s/ .*//p}")
-MTDEVS=$(scan_dmesg "${MDMTDEVS:-/^[cmsw]t[0-9][0-9]* /s/ .*//p}")
+MTDEVS=$(scan_dmesg "${MDMTDEVS:-/^[cms]t[0-9][0-9]* /s/ .*//p}")
IFDEVS=$(get_ifdevs)
SERIALDEV=$(get_serialdev)
diff --git a/distrib/vax/install.md b/distrib/vax/install.md
index d5a5b98d99c..68a9ed28655 100644
--- a/distrib/vax/install.md
+++ b/distrib/vax/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.24 2005/04/03 19:34:00 krw Exp $
+# $OpenBSD: install.md,v 1.25 2007/05/28 02:57:11 krw Exp $
# $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
#
#
@@ -43,7 +43,7 @@
MDTERM=vt100
MDDKDEVS='/^[hs]d[0-9] /s/ .*//p;/^r[al][0-9] /s/ .*//p'
MDCDDEVS='/^cd[0-9] /s/ .*//p;/^ra[0-9] .* RRD40$/s/ .*//p'
-MDMTDEVS='/^[cmsw]t[0-9][0-9]* /s/ .*//p;/^ts[0-9]0-9]* /s/ .*//p'
+MDMTDEVS='/^[cms]t[0-9][0-9]* /s/ .*//p;/^ts[0-9]0-9]* /s/ .*//p'
ARCH=ARCH
md_installboot() {