From e59c1326f96aa49976a63a70f1252c59ab093cf0 Mon Sep 17 00:00:00 2001
From: Michael Kuzmin <mkuzmin@gmail.com>
Date: Sun, 6 May 2018 19:04:51 +0300
Subject: [PATCH] default value for 'boot_order' in iso builder

---
 clone/config.go                   | 1 -
 common/step_run.go                | 8 +++++---
 examples/macos/macos-10.13.json   | 2 --
 examples/ubuntu/ubuntu-16.04.json | 3 +--
 examples/windows/windows-10.json  | 3 +--
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/clone/config.go b/clone/config.go
index d4839163d..a2a230503 100644
--- a/clone/config.go
+++ b/clone/config.go
@@ -31,7 +31,6 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) {
 
 	errs := new(packer.MultiError)
 	errs = packer.MultiErrorAppend(errs, c.Comm.Prepare(&c.ctx)...)
-	errs = packer.MultiErrorAppend(errs, c.RunConfig.Prepare()...)
 	errs = packer.MultiErrorAppend(errs, c.ConnectConfig.Prepare()...)
 	errs = packer.MultiErrorAppend(errs, c.CloneConfig.Prepare()...)
 	errs = packer.MultiErrorAppend(errs, c.HardwareConfig.Prepare()...)
diff --git a/common/step_run.go b/common/step_run.go
index 8da3663d0..46f7bba5b 100644
--- a/common/step_run.go
+++ b/common/step_run.go
@@ -10,13 +10,15 @@ import (
 )
 
 type RunConfig struct {
-	BootOrder   string        `mapstructure:"boot_order"` // example: "floppy,cdrom,ethernet,disk"
+	BootOrder string `mapstructure:"boot_order"` // example: "floppy,cdrom,ethernet,disk"
 }
 
 func (c *RunConfig) Prepare() []error {
-	var errs []error
+	if c.BootOrder == "" {
+		c.BootOrder = "disk,cdrom"
+	}
 
-	return errs
+	return nil
 }
 
 type StepRun struct {
diff --git a/examples/macos/macos-10.13.json b/examples/macos/macos-10.13.json
index 6e36c439c..1f6fdbbcc 100644
--- a/examples/macos/macos-10.13.json
+++ b/examples/macos/macos-10.13.json
@@ -33,8 +33,6 @@
         "[datastore-mac] ISO/VMware Tools/10.2.0/darwin.iso"
       ],
 
-      "boot_order": "disk,cdrom",
-
       "boot_wait": "4m",
       "boot_command": [
         "<enter><wait5>",
diff --git a/examples/ubuntu/ubuntu-16.04.json b/examples/ubuntu/ubuntu-16.04.json
index b2af62b47..d7ea5e89f 100644
--- a/examples/ubuntu/ubuntu-16.04.json
+++ b/examples/ubuntu/ubuntu-16.04.json
@@ -49,8 +49,7 @@
         " locale=en_US",
         " file=/media/preseed.cfg",
         "<enter>"
-      ],
-      "boot_order": "disk,cdrom"
+      ]
     }
   ],
 
diff --git a/examples/windows/windows-10.json b/examples/windows/windows-10.json
index 5dcd0e679..4a0eef8fc 100644
--- a/examples/windows/windows-10.json
+++ b/examples/windows/windows-10.json
@@ -35,8 +35,7 @@
       "floppy_files": [
         "{{template_dir}}/setup/"
       ],
-      "floppy_img_path": "[datastore1] ISO/VMware Tools/10.2.0/pvscsi-Windows8.flp",
-      "boot_order": "disk,cdrom"
+      "floppy_img_path": "[datastore1] ISO/VMware Tools/10.2.0/pvscsi-Windows8.flp"
     }
   ],