diff options
| author | Klemens Nanni <kn@cvs.openbsd.org> | 2023-10-11 17:53:53 +0000 |
|---|---|---|
| committer | Klemens Nanni <kn@cvs.openbsd.org> | 2023-10-11 17:53:53 +0000 |
| commit | b3f5f6cddb08204edc96fbd3a36a8a18ba5240c5 (patch) | |
| tree | a872e17d47796c39f4d8aaad8f9d5c1ad7facd7b /distrib | |
| parent | a62a6ecf839b4fce020e73b3c346b7b50bb7671e (diff) | |
Remove dead CRYPTOCHUNK usage
install.sub r1.1245 "Ask for disk crypto after root disk question" got rid
of global CRYPTO* variables; no functional change.
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/amd64/common/install.md | 4 | ||||
| -rw-r--r-- | distrib/arm64/ramdisk/install.md | 6 | ||||
| -rw-r--r-- | distrib/riscv64/ramdisk/install.md | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md index 6e996c04e0e..e888a851f36 100644 --- a/distrib/amd64/common/install.md +++ b/distrib/amd64/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.61 2023/05/26 11:41:50 kn Exp $ +# $OpenBSD: install.md,v 1.62 2023/10/11 17:53:52 kn Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. @@ -126,7 +126,7 @@ __EOT [oO]*) [[ $_d == OpenBSD ]] || continue # Is this a boot disk? - if [[ $_disk == @($ROOTDISK|$CRYPTOCHUNK) ]] && + if [[ $_disk == $ROOTDISK ]] && disk_has $_disk gpt && ! disk_has $_disk gpt efisys; then echo "No EFI Sys partition in GPT, try again." $AUTO && exit 1 diff --git a/distrib/arm64/ramdisk/install.md b/distrib/arm64/ramdisk/install.md index d855aabef0e..0c4a8dcd13c 100644 --- a/distrib/arm64/ramdisk/install.md +++ b/distrib/arm64/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.47 2023/04/27 17:04:17 caspar Exp $ +# $OpenBSD: install.md,v 1.48 2023/10/11 17:53:52 kn Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -116,14 +116,14 @@ md_prep_fdisk() { KEEP_EFI_SYS=true # Is this a boot disk? - if [[ $_disk == @($ROOTDISK|$CRYPTOCHUNK) ]]; then + if [[ $_disk == $ROOTDISK ]]; then fdisk -Ay -b "${bootsectorsize}" ${_disk} >/dev/null else fdisk -Ay ${_disk} >/dev/null fi elif disk_has $_disk gpt; then # Is this a boot disk? - if [[ $_disk == @($ROOTDISK|$CRYPTOCHUNK) ]]; then + if [[ $_disk == $ROOTDISK ]]; then fdisk -gy -b "${bootsectorsize}" ${_disk} >/dev/null # With root on softraid, diff --git a/distrib/riscv64/ramdisk/install.md b/distrib/riscv64/ramdisk/install.md index cd7266cc5ae..b8e69057748 100644 --- a/distrib/riscv64/ramdisk/install.md +++ b/distrib/riscv64/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.9 2023/04/26 23:12:31 kn Exp $ +# $OpenBSD: install.md,v 1.10 2023/10/11 17:53:52 kn Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -56,7 +56,7 @@ md_prep_fdisk() { _d=whole if disk_has $_disk gpt; then # Is this a boot disk? - [[ $_disk == @($ROOTDISK|$CRYPTOCHUNK) ]] && bootpart="-b ${bootsectorsize}" + [[ $_disk == $ROOTDISK ]] && bootpart="-b ${bootsectorsize}" _type=GPT fdisk $_disk elif disk_has $_disk mbr; then |