diff options
| author |   benno <benno@openbsd.org> | 2014-09-26 15:44:21 +0000 |
|---|---|---|
| committer | benno <benno@openbsd.org> | 2014-09-26 15:44:21 +0000 |
| commit | 7a0e4d1b3da622efd97bfffcd40a7e0c276be937 (patch) | |
| tree | 5086c29a57841b633c1aec75048b684c829c9443 | |
| parent | Don't mask off revision bits for tests against a full (diff) | |
| download | wireguard-openbsd-7a0e4d1b3da622efd97bfffcd40a7e0c276be937.tar.xz wireguard-openbsd-7a0e4d1b3da622efd97bfffcd40a7e0c276be937.zip | |
make the default of the "Change the default console" question depend
on whether the install is done on a serial console.
ok halex@, deraadt@ likes it too
| -rw-r--r-- | distrib/miniroot/install.sub | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index b4d2d8c88f6..215b4371c9d 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.793 2014/08/31 20:10:36 rpe Exp $ +# $OpenBSD: install.sub,v 1.794 2014/09/26 15:44:21 benno Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback # All rights reserved. @@ -1836,7 +1836,7 @@ apply() } questions() { - local _d + local _d _cdef=no ask_yn "Start sshd(8) by default?" yes sshd=$resp @@ -1868,7 +1868,8 @@ questions() { if [[ -n $CDEV ]]; then _d=${CPROM:-$CDEV} - ask_yn "Change the default console to $_d?" + [[ -n $CONSOLE ]] && _cdef=yes + ask_yn "Change the default console to $_d?" $_cdef defcons=$resp if [[ $resp == y ]]; then ask_which "speed" "should $_d use" \ |