Merge pull request #10850 from baude/issue10824

Create podman temp dir on machine start

1 files changed, 17 insertions, 5 deletions

diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
index 22fb78a5c..42ae23c43 100644
--- a/pkg/machine/qemu/machine.go
+++ b/pkg/machine/qemu/machine.go
@@ -15,9 +15,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containers/podman/v3/pkg/rootless"
-
 	"github.com/containers/podman/v3/pkg/machine"
+	"github.com/containers/podman/v3/pkg/rootless"
 	"github.com/containers/podman/v3/utils"
 	"github.com/containers/storage/pkg/homedir"
 	"github.com/digitalocean/go-qemu/qmp"
@@ -248,7 +247,23 @@ func (v *MachineVM) Start(name string, _ machine.StartOptions) error {
 	if err := v.startHostNetworking(); err != nil {
 		return errors.Errorf("unable to start host networking: %q", err)
 	}
+
+	rtPath, err := getRuntimeDir()
+	if err != nil {
+		return err
+	}
+
+	// If the temporary podman dir is not created, create it
+	podmanTempDir := filepath.Join(rtPath, "podman")
+	if _, err := os.Stat(podmanTempDir); os.IsNotExist(err) {
+		if mkdirErr := os.MkdirAll(podmanTempDir, 0755); mkdirErr != nil {
+			return err
+		}
+	}
 	qemuSocketPath, _, err := v.getSocketandPid()
+	if err != nil {
+		return err
+	}
 
 	for i := 0; i < 6; i++ {
 		qemuSocketConn, err = net.Dial("unix", qemuSocketPath)
@@ -258,9 +273,6 @@ func (v *MachineVM) Start(name string, _ machine.StartOptions) error {
 		time.Sleep(wait)
 		wait++
 	}
-	if err != nil {
-		return err
-	}
 
 	fd, err := qemuSocketConn.(*net.UnixConn).File()
 	if err != nil {