summaryrefslogtreecommitdiff
path: root/distrib/miniroot/install.sub
diff options
context:
space:
mode:
authorRobert Peichaer <rpe@cvs.openbsd.org>2017-05-22 17:15:53 +0000
committerRobert Peichaer <rpe@cvs.openbsd.org>2017-05-22 17:15:53 +0000
commit8791f24f51c27479c237b2f7e0dc738688f4c271 (patch)
tree01b5a65b2449a516c4cc4a3bca11fbe57088310c /distrib/miniroot/install.sub
parent21e97c315ff217068e82bc20b491fe4dbf513736 (diff)
No need to trim a trailling blank, bsort (in scan_dmesg) does not
emit one anymore.
Diffstat (limited to 'distrib/miniroot/install.sub')
-rw-r--r--distrib/miniroot/install.sub3
1 files changed, 1 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index eb008a4e85f..280aef78c46 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
#!/bin/ksh
-# $OpenBSD: install.sub,v 1.1005 2017/05/21 09:09:58 rpe Exp $
+# $OpenBSD: install.sub,v 1.1006 2017/05/22 17:15:52 rpe Exp $
#
# Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
# Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org>
@@ -3097,7 +3097,6 @@ fi
# Scan /var/run/dmesg.boot for interesting devices.
DISPLAY=$(scan_dmesg '/^wsdisplay[0-9]* /s/ .*//p')
CONSOLE=$(scan_dmesg '/^\([^ ]*\).*: console$/s//\1/p')
-CONSOLE=${CONSOLE% }
[[ -n $CONSOLE ]] && CSPEED=$(stty speed </dev/console)
# Look for the serial device matching the console. If we are not installing