Fix last linter issues

canonical · Sep 19, 2023 · 1945b45 · 1945b45
1 parent 361d529
commit 1945b45
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/internal/statemachine/classic_states.go b/internal/statemachine/classic_states.go
@@ -1194,6 +1194,7 @@ func (stateMachine *StateMachine) preseedClassicImage() error {
 	// assemble the commands in the correct order: mount, preseed, unmount
 	preseedCmds = append(preseedCmds, mountCmds...)
 	preseedCmds = append(preseedCmds,
+		//nolint:gosec,G204
 		exec.Command("/usr/lib/snapd/snap-preseed", stateMachine.tempDirs.chroot),
 	)
 	preseedCmds = append(preseedCmds, umountCmds...)

diff --git a/internal/statemachine/helper.go b/internal/statemachine/helper.go
@@ -1079,7 +1079,15 @@ func (stateMachine *StateMachine) updateGrub(rootfsVolName string, rootfsPartNum
 		"--detach",
 		loopUsed,
 	)
-	defer teardownCmd.Run()
+	defer func() {
+		if tmpErr := teardownCmd.Run(); tmpErr != nil {
+			if err != nil {
+				err = fmt.Errorf("%s after previous error: %w", tmpErr, err)
+			} else {
+				err = tmpErr
+			}
+		}
+	}()
 	updateGrubCmds = append(updateGrubCmds, teardownCmd)
 
 	// now run all the commands