From bc3810f5c0e25ca75e6ba878ebc0570dcb19f471 Mon Sep 17 00:00:00 2001
From: Michael Kuzmin <mkuzmin@gmail.com>
Date: Wed, 14 Feb 2018 11:01:41 +0300
Subject: [PATCH] 'floppy_files' and 'floppy_files' create two separate drives

---
 iso/step_add_floppy.go | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/iso/step_add_floppy.go b/iso/step_add_floppy.go
index 3b996458f..b645265e2 100644
--- a/iso/step_add_floppy.go
+++ b/iso/step_add_floppy.go
@@ -48,11 +48,6 @@ func (s *StepAddFloppy) runImpl(state multistep.StateBag) error {
 	d := state.Get("driver").(*driver.Driver)
 
 	tmpFloppy := state.Get("floppy_path")
-	if s.Config.FloppyIMGPath != "" && tmpFloppy != nil {
-		return fmt.Errorf("'floppy_img_path' cannot be used together with 'floppy_files' and 'floppy_dirs'")
-	}
-
-	var floppyIMGPath string
 	if tmpFloppy != nil {
 		ui.Say("Uploading created floppy image")
 
@@ -72,15 +67,21 @@ func (s *StepAddFloppy) runImpl(state multistep.StateBag) error {
 
 		// remember the path to the temporary floppy image to remove it after the build is finished
 		s.uploadedFloppyPath = uploadPath
-		floppyIMGPath = ds.ResolvePath(uploadPath)
-	} else {
-		floppyIMGPath = s.Config.FloppyIMGPath
+		floppyIMGPath := ds.ResolvePath(uploadPath)
+		ui.Say("Adding generated Floppy...")
+		err = vm.AddFloppy(floppyIMGPath)
+		if err != nil {
+			return err
+		}
 	}
 
-	ui.Say("Adding Floppy...")
-	err := vm.AddFloppy(floppyIMGPath)
-	if err != nil {
-		return err
+	if s.Config.FloppyIMGPath != "" {
+		floppyIMGPath := s.Config.FloppyIMGPath
+		ui.Say("Adding Floppy image...")
+		err := vm.AddFloppy(floppyIMGPath)
+		if err != nil {
+			return err
+		}
 	}
 
 	return nil