Merge pull request #17027 from n8henrie/issue_17026

Resolve symlink path for qemu directory if possible
containers · Feb 8, 2023 · c5bfacd · c5bfacd
2 parents c5f83f2 + 6b64589
commit c5bfacd
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/pkg/machine/qemu/options_darwin_arm64.go b/pkg/machine/qemu/options_darwin_arm64.go
@@ -46,13 +46,23 @@ func getOvmfDir(imagePath, vmName string) string {
  */
 func getEdk2CodeFdPathFromQemuBinaryPath() string {
 	cfg, err := config.Default()
-	if err == nil {
-		execPath, err := cfg.FindHelperBinary(QemuCommand, true)
-		if err == nil {
-			return filepath.Clean(filepath.Join(filepath.Dir(execPath), "..", "share", "qemu"))
-		}
+	if err != nil {
+		return ""
+	}
+	execPath, err := cfg.FindHelperBinary(QemuCommand, true)
+	if err != nil {
+		return ""
+	}
+
+	sharePath := func(path string) string {
+		return filepath.Clean(filepath.Join(filepath.Dir(path), "..", "share", "qemu"))
+	}
+
+	symlinkedPath, err := filepath.EvalSymlinks(execPath)
+	if err != nil {
+		return sharePath(execPath)
 	}
-	return ""
+	return sharePath(symlinkedPath)
 }
 
 /*