diff options
| author |   anton <anton@openbsd.org> | 2018-03-15 17:43:54 +0000 |
|---|---|---|
| committer | anton <anton@openbsd.org> | 2018-03-15 17:43:54 +0000 |
| commit | 9dbd1d6cec726eeef2aed787d4e0254f6e630ae1 (patch) | |
| tree | 953f3ab605bb819197dfc08665de422526fea37d | |
| parent | Favor usage of __func__ in warning/error messages. Some of them referred to the (diff) | |
| download | wireguard-openbsd-9dbd1d6cec726eeef2aed787d4e0254f6e630ae1.tar.xz wireguard-openbsd-9dbd1d6cec726eeef2aed787d4e0254f6e630ae1.zip | |
Always ensure to output a newline after checking for available syspatches.
Otherwise, if syspatch exits 1 any subsequent output will end up on the same
line during boot. Discovered while upgrading from current today since we're in
release mode.
Discussed with and ok tb@
| -rw-r--r-- | distrib/miniroot/install.sub | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index ea9c3a84054..c6970521e36 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.1065 2018/02/21 20:02:37 rpe Exp $ +# $OpenBSD: install.sub,v 1.1066 2018/03/15 17:43:54 anton Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -2776,7 +2776,8 @@ set -A _KERNV -- \$(sysctl -n kern.version | if ((\${#_KERNV[*]} == 1)) && [[ -s /etc/installurl ]] && _CKPATCH=\$(mktemp /tmp/_ckpatch.XXXXXXXXXX); then echo -n "Checking for available binary patches... " - syspatch -c > \$_CKPATCH && echo "done." + syspatch -c > \$_CKPATCH && echo -n "done." + echo if [[ -s \$_CKPATCH ]]; then echo "Run syspatch(8) to install:" cat \$_CKPATCH |