refactor defaults override

cmd/command/edge/image.go

@@ -89,6 +89,15 @@ func (p *Plural) handleEdgeImage(c *cli.Context) error {
 		return err
 	}
 
+	utils.Highlight("overwriting default configuration to remove default user\n")
+	defaultsPath := filepath.Join(outputDirPath, "defaults.yaml")
+	if err := utils.WriteFile(defaultsPath, []byte("#cloud-config\n")); err != nil {
+		return err
+	}
+	defer func() {
+		_ = os.Remove(defaultsPath)
+	}()
+
 	utils.Highlight("preparing %s volume\n", volumeName)
 	if err = utils.Exec("docker", "volume", "create", volumeName); err != nil {
 		return err
@@ -114,24 +123,10 @@ func (p *Plural) handleEdgeImage(c *cli.Context) error {
 	}
 
 	utils.Highlight("building image\n")
-
-	// Override /oem/defaults.yaml file to get rid of the default password for the kairos user
-	dir, err := os.MkdirTemp("", "image")
-	if err != nil {
-		return err
-	}
-	defer func(path string) {
-		_ = os.RemoveAll(path)
-	}(dir)
-	defaultsFile := filepath.Join(dir, "defaults.yaml")
-	if err := utils.WriteFile(defaultsFile, []byte("#cloud-config\n")); err != nil {
-		return err
-	}
-
 	if err = utils.Exec("docker", "run", "-v", "/var/run/docker.sock:/var/run/docker.sock",
 		"-v", buildDirPath+":/tmp/build",
 		"-v", cloudConfigPath+":/cloud-config.yaml",
-		"-v", defaultsFile+":/defaults.yaml",
+		"-v", defaultsPath+":/defaults.yaml",
 		"--mount", volumeMount,
 		"--privileged", "-i", "--rm",
 		"--entrypoint=/build-arm-image.sh", config.AurorabootImage,