diff options
| author | Klemens Nanni <kn@cvs.openbsd.org> | 2023-04-26 22:45:33 +0000 |
|---|---|---|
| committer | Klemens Nanni <kn@cvs.openbsd.org> | 2023-04-26 22:45:33 +0000 |
| commit | 16127395811adb1438680e2db505e81350ccf7c2 (patch) | |
| tree | d0e9843d2729170636fe2379dfac711b614a414b /distrib/amd64 | |
| parent | a54a05020bd5b145cd56b78671c103e4249c3029 (diff) | |
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?".
Diffstat (limited to 'distrib/amd64')
| -rw-r--r-- | distrib/amd64/common/install.md | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md index 905accdb10d..842be5384c5 100644 --- 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 |