diff options
| author | Alexander Hall <halex@cvs.openbsd.org> | 2015-09-09 15:04:55 +0000 |
|---|---|---|
| committer | Alexander Hall <halex@cvs.openbsd.org> | 2015-09-09 15:04:55 +0000 |
| commit | 2d9ea58ddd376ae0fe9664cc7238ad3429262d6a (patch) | |
| tree | 27f72224d0cf73ca61d80805f860051eeb9f77e9 /distrib | |
| parent | d4fdf47e57e46c718170defcf0fedb16bf4ccf2e (diff) | |
At some point back in time, the disk info (obtained by responding '?' at
the root disk question) got some extra linefeeds in it. This fixes the
output to be one line per disk again.
ok krw@
Diffstat (limited to 'distrib')
| -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 c80bfd29d36..688611380cf 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.855 2015/08/24 10:41:11 ajacoutot Exp $ +# $OpenBSD: install.sub,v 1.856 2015/09/09 15:04:54 halex Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -210,7 +210,7 @@ diskinfo() { makedev $_d echo -n "$_d: " disklabel -dpg $_d 2>/dev/null | - sed -e '/^label: /{s,,,;s/ *$//;s/^$/<no label>/;H;d;}' \ + sed -e '/^label: /{s,,,;s/ *$//;s/^$/<no label>/;h;d;}' \ -e '/.*# total bytes: \(.*\)/{s//(\1)/;H;}' \ -e '$!d;x;s/\n/ /' rm -f /dev/{r,}$_d? |