summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2010-09-23 13:30:16 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2010-09-23 13:30:16 +0000
commit34321fc75ac9214811bf0255311b147923453fda (patch)
tree57e36cb237cb5cdbdf595d20173d8c1204e0dff3
parent1b691368ec2dac85f6a41050b3a0b99475b3e332 (diff)
Teach the installer how to process the new hw.disknames output.
ok krw@
-rw-r--r--distrib/miniroot/install.sub4
1 files changed, 2 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index e14eb2df9b6..0d22c3b2b7e 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.618 2010/08/30 09:52:07 halex Exp $
+# $OpenBSD: install.sub,v 1.619 2010/09/23 13:30:15 jsing Exp $
# $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
#
# Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback
@@ -111,7 +111,7 @@ scan_dmesg() {
scan_disknames() {
local _n _oifs=$IFS
IFS=","
- bsort $(for _n in $(sysctl -n hw.disknames); do echo "$_n "; done | sed -ne "$1")
+ bsort $(for _n in $(sysctl -n hw.disknames); do echo "$_n " | sed "s/:.*$//"; done | sed -ne "$1")
IFS=$_oifs
}