Merge pull request containers#20683 from baude/applehvsshkeys

Avoid empty SSH keys on applehv
jwhonce · Nov 14, 2023 · 1d49773 · 1d49773
2 parents 540ade0 + ea89eaa
commit 1d49773
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/pkg/machine/applehv/machine.go b/pkg/machine/applehv/machine.go
@@ -251,6 +251,14 @@ func (m *MacMachine) Init(opts machine.InitOptions) (bool, error) {
 		return false, err
 	}
 
+	if len(opts.IgnitionPath) < 1 {
+		key, err = machine.CreateSSHKeys(m.IdentityPath)
+		if err != nil {
+			return false, err
+		}
+		callbackFuncs.Add(m.removeSSHKeys)
+	}
+
 	builder := machine.NewIgnitionBuilder(machine.DynamicIgnition{
 		Name:      opts.Username,
 		Key:       key,
@@ -262,14 +270,6 @@ func (m *MacMachine) Init(opts machine.InitOptions) (bool, error) {
 		Rootful:   m.Rootful,
 	})
 
-	if len(opts.IgnitionPath) < 1 {
-		key, err = machine.CreateSSHKeys(m.IdentityPath)
-		if err != nil {
-			return false, err
-		}
-		callbackFuncs.Add(m.removeSSHKeys)
-	}
-
 	if len(opts.IgnitionPath) > 0 {
 		return false, builder.BuildWithIgnitionFile(opts.IgnitionPath)
 	}