From 6a24ab8a00a2b0404dbba2e0752f9997d4134542 Mon Sep 17 00:00:00 2001
From: Manuel Messner
Date: Thu, 22 Feb 2018 15:58:23 +0100
Subject: Makefile: add on-error=ask option in debug mode

---
 Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3db9c23..58d903f 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,11 @@ BOOTTARGETS += $(foreach prov, $(PROVTARGETS), $(prov)/boot)
 override PACKER_OPTS += -var-file=base.json
 ifdef DEBUG
     VERBOSE := 1
-    override PACKER_OPTS += -debug
+    ifeq ($(DEBUG),STEP)
+        override PACKER_OPTS += -debug
+    else
+        override PACKER_OPTS += -on-error=ask
+    endif
 endif
 
 
@@ -208,6 +212,8 @@ help:
 	@printf "\tANSIBLE_DIR: Set directory with ansible roles   (def: ansible-roles)\n"
 	@printf "\tBUILDER:     Set a builder, do not autodetect\n"
 	@printf "\tDEBUG:       Enable debug mode in packer        (includes VERBOSE)\n"
+	@printf "\t  DEBUG=     Enable enhanced on-error handling\n"
+	@printf "\t  DEBUG=STEP Enable step by step debugging in packer\n"
 	@printf "\tHASHER:      Set wanted hasher                  (def: sha256sum)\n"
 	@printf "\tPACKER:      Set packer executable              (def: packer)\n"
 	@printf "\tPACKER_OPTS: Set packer options\n"
-- 
cgit v1.2.3-55-g7522