From: deraadt Date: Tue, 2 May 2023 15:55:58 +0000 (+0000) Subject: Absolutely astounding that custom code was written for the softraid case X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=8bfda6e105d0cd87656fd3e8b8b84f4bf8af5bed;p=openbsd Absolutely astounding that custom code was written for the softraid case to require "no", instead of "n" or "no" which works at every other damn prompt in the installer. This seems to be an artifact of relentlessly pushing people towards softraid by default, and I think that is a bit nasty and pushy. --- diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 868aa086322..d3d944bf2ca 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.1243 2023/04/25 14:20:13 kn Exp $ +# $OpenBSD: install.sub,v 1.1244 2023/05/02 15:55:58 deraadt Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer @@ -3099,7 +3099,7 @@ Create a passphrase protected CRYPTO softraid volume to be used as root disk. __EOT diskinfo $(get_dkdevs);; '') ;; - no) return;; + n|no) return;; *) isin "$resp" $(get_dkdevs) && break echo 'No such disk.';; esac