From fa6120e046e066dfb69c15252b987bcb455de956 Mon Sep 17 00:00:00 2001 From: kn Date: Mon, 21 Aug 2023 08:59:18 +0000 Subject: [PATCH] Remove retry loop crutch around disk passphrase prompt bioctl(8) now retries itself on mismatch so the installer continues until the passphrase is confirmed correctly (like for the root password) instead of bailing out after three failed attempts. --- distrib/miniroot/install.sub | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 4386ec9873c..51f0828534d 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.1253 2023/08/10 17:09:34 kn Exp $ +# $OpenBSD: install.sub,v 1.1254 2023/08/21 08:59:18 kn Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer @@ -3075,7 +3075,7 @@ do_autoinstall() { } encrypt_root() { - local _chunk _tries=0 + local _chunk [[ $MDBOOTSR == y ]] || return @@ -3097,10 +3097,7 @@ encrypt_root() { md_prep_fdisk $_chunk echo 'RAID *' | disklabel -w -A -T- $_chunk - until bioctl -Cforce -cC -l${_chunk}a softraid0 >/dev/null; do - # Most likely botched passphrases, silently retry twice. - ((++_tries < 3)) || exit - done + bioctl -Cforce -cC -l${_chunk}a softraid0 >/dev/null # No volumes existed before asking, but we just created one. ROOTDISK=$(get_softraid_volumes) -- 2.20.1