diff options
| author | Joshua Elsasser <joshe@cvs.openbsd.org> | 2010-09-26 14:49:06 +0000 |
|---|---|---|
| committer | Joshua Elsasser <joshe@cvs.openbsd.org> | 2010-09-26 14:49:06 +0000 |
| commit | ea9732599c996c27d1ace6ccca1e3fdbe082b412 (patch) | |
| tree | 77a9cfa621f5839ddfa7ab32b79209936e5adf88 /distrib/miniroot | |
| parent | cf1992f09ba99b51344245a0ee445190806b04f7 (diff) | |
Correctly parse new hw.disknames output.
Nicer fix from guenther@, tested by editing install.sub while booted
into bsd.rd.
"please commit asap" deraadt@
Diffstat (limited to 'distrib/miniroot')
| -rw-r--r-- | distrib/miniroot/install.sub | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 336dda69046..608a891473b 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.620 2010/09/24 07:44:43 ajacoutot Exp $ +# $OpenBSD: install.sub,v 1.621 2010/09/26 14:49:05 joshe 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 " | sed "s/:.*$//"; done | sed -ne "$1") + bsort $(for _n in $(sysctl -n hw.disknames); do echo "${_n%%:*} "; done | sed -ne "$1") IFS=$_oifs } |