summaryrefslogtreecommitdiff
path: root/distrib/amd64
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2015-12-02 21:17:18 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2015-12-02 21:17:18 +0000
commit080142d31138245ab5a7f7661946189608939304 (patch)
tree8f92b35dc88f858ed22989083e0a812542ae653b /distrib/amd64
parentb445bc63fe83ad0ba0a7d67fee788ea00d3c9fd8 (diff)
If (O)penBSD is not offered as a partitioning option, do not accept
'O*|o*' as a valid response. Ignore it as we do other invalid input. armv7 is special case to be handled separately. Noticed by kettenis@. ok deraadt@ rpe@
Diffstat (limited to 'distrib/amd64')
-rw-r--r--distrib/amd64/common/install.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md
index 99dd6dbbbea..15a01a62c98 100644
--- a/distrib/amd64/common/install.md
+++ b/distrib/amd64/common/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.46 2015/12/02 17:46:03 krw Exp $
+# $OpenBSD: install.md,v 1.47 2015/12/02 21:17:16 krw Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -132,6 +132,7 @@ __EOT
fi
echo "try again." ;;
o*|O*)
+ [[ $_d == OpenBSD ]] || continue
_d=$(fdisk $_disk | grep "First usable LBA:")
_q=$(fdisk $_disk | grep "^ EFI Sys ")
if [[ -n $_d && -z $_q ]]; then