Treat crypto disk like the root disk, both are boot disks

Chosing an existing OpenBSD partition on GPT during disk setup requires an
existing EFI Sys partition (the installer does not create it in thi case).

With 'Encrypt the root disk?' answered postively, the crypto disk instead of
the root disk becomes the boot disk.

Extend the EFI Sys sanity check to both crypto and root disk, really asking
"is this a boot disk?".

diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md
index 905accd..842be53 100644 (file)
--- a/distrib/amd64/common/install.md
+++ b/distrib/amd64/common/install.md
@@ -1,4 +1,4 @@
-#      $OpenBSD: install.md,v 1.59 2023/03/07 17:29:42 kn Exp $
+#      $OpenBSD: install.md,v 1.60 2023/04/26 22:45:32 kn Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -126,8 +126,9 @@ __EOT
                        echo " try again." ;;
                [oO]*)
                        [[ $_d == OpenBSD ]] || continue
-                       if [[ $_disk == $ROOTDISK ]] && disk_has $_disk gpt &&
-                               ! disk_has $_disk gpt efisys; then
+                       # Is this a boot disk?
+                       if [[ $_disk == @($ROOTDISK|$CRYPTOCHUNK) ]] &&
+                           disk_has $_disk gpt && ! disk_has $_disk gpt efisys; then
                                echo "No EFI Sys partition in GPT, try again."
                                $AUTO && exit 1
                                continue