model: controller: Keep Image default

--keep-image defaults to true, we only try to remove an image file if it is set to false. Signed-off-by: Mark D Horn <[email protected]>
clearlinux · Nov 26, 2019 · a4f83fd · a4f83fd
1 parent f2e376e
commit a4f83fd
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 21 deletions.
diff --git a/controller/controller.go b/controller/controller.go
@@ -211,12 +211,6 @@ func Install(rootDir string, model *model.SystemInstall, options args.Args) erro
 			log.Warning(msg)
 			model.MakeISO = false
 		}
-		if model.KeepImage {
-			msg := "Flag --keep-image not valid for physical media; disabling"
-			fmt.Println(msg)
-			log.Warning(msg)
-			model.KeepImage = false
-		}
 	}
 
 	// prepare all the target block devices

diff --git a/model/model.go b/model/model.go
@@ -612,9 +612,6 @@ func (si *SystemInstall) InteractiveOptionsValid() error {
 	if si.MakeISO {
 		return fmt.Errorf("Incompatible flag '--iso' for the interactive installer")
 	}
-	if si.KeepImage {
-		return fmt.Errorf("Incompatible flag '--keep-image' for the interactive installer")
-	}
 
 	return nil
 }
diff --git a/model/model_test.go b/model/model_test.go
@@ -636,24 +636,12 @@ func TestInterActiveIsoFail(t *testing.T) {
 		t.Fatalf("Interactive should fail with ISO set to true")
 	}
 }
-func TestInterActiveKeepFail(t *testing.T) {
-	si := &SystemInstall{}
-	si.ClearInstallSelected()
-
-	si.KeepImage = true
-
-	if err := si.InteractiveOptionsValid(); err == nil {
-		t.Fatalf("Interactive should fail with KeepImage set to true")
-	}
-}
-
 func TestInterActivePass(t *testing.T) {
 	si := &SystemInstall{}
 	si.ClearInstallSelected()
 
 	si.Offline = false
 	si.MakeISO = false
-	si.KeepImage = false
 
 	if err := si.InteractiveOptionsValid(); err != nil {
 		t.Fatalf("Interactive should pass: %v", err)