From aedfab264f33d717ac952e0116b79faf11a1944b Mon Sep 17 00:00:00 2001
From: Michael Kuzmin <mkuzmin@gmail.com>
Date: Sat, 5 May 2018 00:10:43 +0300
Subject: [PATCH] add/remove cdrom & floppy only if vm is started

---
 iso/builder.go | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/iso/builder.go b/iso/builder.go
index 7ee7e062d..bacc83c68 100644
--- a/iso/builder.go
+++ b/iso/builder.go
@@ -39,18 +39,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		&StepCreateVM{
 			Config: &b.config.CreateConfig,
 		},
-		&StepAddCDRom{
-			Config: &b.config.CDRomConfig,
-		},
-		&packerCommon.StepCreateFloppy{
-			Files:       b.config.FloppyFiles,
-			Directories: b.config.FloppyDirectories,
-		},
-		&StepAddFloppy{
-			Config:    &b.config.FloppyConfig,
-			Datastore: b.config.Datastore,
-			Host:      b.config.Host,
-		},
 		&StepConfigParams{
 			Config: &b.config.ConfigParamsConfig,
 		},
@@ -58,6 +46,18 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 
 	if b.config.Comm.Type != "none" {
 		steps = append(steps,
+			&StepAddCDRom{
+				Config: &b.config.CDRomConfig,
+			},
+			&packerCommon.StepCreateFloppy{
+				Files:       b.config.FloppyFiles,
+				Directories: b.config.FloppyDirectories,
+			},
+			&StepAddFloppy{
+				Config:    &b.config.FloppyConfig,
+				Datastore: b.config.Datastore,
+				Host:      b.config.Host,
+			},
 			&common.StepRun{
 				Config: &b.config.RunConfig,
 			},
@@ -74,15 +74,15 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			&common.StepShutdown{
 				Config: &b.config.ShutdownConfig,
 			},
+			&StepRemoveCDRom{},
+			&StepRemoveFloppy{
+				Datastore: b.config.Datastore,
+				Host:      b.config.Host,
+			},
 		)
 	}
 
 	steps = append(steps,
-		&StepRemoveCDRom{},
-		&StepRemoveFloppy{
-			Datastore: b.config.Datastore,
-			Host:      b.config.Host,
-		},
 		&common.StepCreateSnapshot{
 			CreateSnapshot: b.config.CreateSnapshot,
 		},
@@ -91,7 +91,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		},
 	)
 
-	// Run!
 	b.runner = packerCommon.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(state)