summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Peichaer <rpe@cvs.openbsd.org>2015-12-28 17:00:14 +0000
committerRobert Peichaer <rpe@cvs.openbsd.org>2015-12-28 17:00:14 +0000
commit18326868773a46088a443019ea63bd68a3a11231 (patch)
tree3f405db17ec1f44e3cc8258dab6332fa46d705c5
parent2afa32c2c138b927d449b8bc3249150ca8e98cf3 (diff)
- no need to insist on EFISYS partitions on non-root disks.
- prevent autoinstall loop OK krw@
-rw-r--r--distrib/amd64/common/install.md6
1 files changed, 4 insertions, 2 deletions
diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md
index 5ffccde57a4..8cf13f0f6b0 100644
--- a/distrib/amd64/common/install.md
+++ b/distrib/amd64/common/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.48 2015/12/18 16:20:58 rpe Exp $
+# $OpenBSD: install.md,v 1.49 2015/12/28 17:00:13 rpe Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -125,8 +125,10 @@ __EOT
echo "try again." ;;
o*|O*)
[[ $_d == OpenBSD ]] || continue
- if disk_has $_disk gpt && ! disk_has $_disk gpt efisys; then
+ 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
continue
fi
return ;;