diff options
| author |   rpe <rpe@openbsd.org> | 2017-02-08 22:56:01 +0000 |
|---|---|---|
| committer | rpe <rpe@openbsd.org> | 2017-02-08 22:56:01 +0000 |
| commit | fffbe0d6edd387429a4ca3dfbddbf23de62f91ac (patch) | |
| tree | 5532e7c5fe1f362cc704a5f882cb4b807c2b0ffe | |
| parent | Add some more line breaks to fit to 80 columns. (diff) | |
| download | wireguard-openbsd-fffbe0d6edd387429a4ca3dfbddbf23de62f91ac.tar.xz wireguard-openbsd-fffbe0d6edd387429a4ca3dfbddbf23de62f91ac.zip | |
Use a variable to make the prompt fit to 80 columns.
| -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 877fe4d1fdd..884f70e6ea0 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.967 2017/02/08 22:43:37 rpe Exp $ +# $OpenBSD: install.sub,v 1.968 2017/02/08 22:56:01 rpe Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -390,7 +390,7 @@ disk_has() { # $2 = /path/to/fstab # disklabel_autolayout() { - local _disk=$1 _f=$2 _dl=/tmp/i/disklabel.auto _op + local _disk=$1 _f=$2 _dl=/tmp/i/disklabel.auto _op _qst # Skip disklabel auto-layout for any disk except the root disk. [[ $_disk != $ROOTDISK ]] && return @@ -413,10 +413,11 @@ disklabel_autolayout() { fi done + _qst="Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" while :; do echo "The auto-allocated layout for $_disk is:" disklabel -h -A $_disk | egrep "^# |^ [a-p]:" - ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a + ask "$_qst" a case $resp in [aA]*) _op=-w;; [eE]*) _op=-E;; |