From: rpe <rpe@openbsd.org>
Date: Fri, 9 Oct 2015 18:30:54 +0000 (+0000)
Subject: Exit autoinstall in case of an invalid choice.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=ab83c509c71b9d6ba120cd78c62b82056639c420;p=openbsd

Exit autoinstall in case of an invalid choice.

OK krw@
---

diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md
index 92e93604cdc..d00dfad86a1 100644
--- a/distrib/amd64/common/install.md
+++ b/distrib/amd64/common/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.42 2015/10/07 18:02:06 krw Exp $
+#	$OpenBSD: install.md,v 1.43 2015/10/09 18:30:54 rpe Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -81,7 +81,11 @@ __EOT
 			echo "done."
 			return ;;
 		g*|G*)
-			[[ $MDEFI == y && $_disk == $ROOTDISK ]] || continue
+			if [[ $MDEFI != y || $_disk != $ROOTDISK ]]; then
+				echo "'$resp' is not a valid choice."
+				$AUTO && exit 1
+				continue
+			fi
 
 			echo -n "Setting OpenBSD GPT partition to whole $_disk..."
 			fdisk -i -g -b 960 -y $_disk >/dev/null