From: kn <kn@openbsd.org>
Date: Wed, 2 Aug 2023 08:51:16 +0000 (+0000)
Subject: Simplify disk encryption question
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=cbd0dcb41f30e077b11a24401d93567b190dce66;p=openbsd

Simplify disk encryption question

The yes/no question was mistaken as actual passphrase prompt and/or details
in parentheses were taken as option list (despite the lack of commas).

Unmention the only disk encryption mechanism we support and simply ask
whether to protect the root disk with a passphrase or not (still yes/no).

Prodded by solene, feedback from many
Wording from naddy, similar wording from sthen
OK naddy sthen deraadt afresh1
---

diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 5260c8197f9..b9fc210d10f 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: install.sub,v 1.1251 2023/07/08 15:01:09 kn Exp $
+#	$OpenBSD: install.sub,v 1.1252 2023/08/02 08:51:16 kn Exp $
 #
 # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
 # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org>
@@ -3088,7 +3088,7 @@ encrypt_root() {
 	# e.g. auto-assembled at boot or done in (S)hell.
 	[[ -z $(get_softraid_volumes) ]] || return
 
-	ask_yn 'Encrypt the root disk? (passphrase CRYPTO softraid)' || return
+	ask_yn 'Encrypt the root disk with a passphrase?' || return
 
 	_chunk=$ROOTDISK
 	echo "\nConfiguring the crypto chunk $_chunk...\n"