Merge pull request #14247 from n1hility/machine-event-win-41

[v4.1] Cherry-pick windows machine events

4 files changed, 33 insertions, 2 deletions

diff --git a/cmd/podman/machine/machine.go b/cmd/podman/machine/machine.go
index 553f1ef7a..5a8a06b9d 100644
--- a/cmd/podman/machine/machine.go
+++ b/cmd/podman/machine/machine.go
@@ -115,7 +115,7 @@ func resolveEventSock() ([]string, error) {
 			return err
 		case info.IsDir():
 			return nil
-		case info.Type() != os.ModeSocket:
+		case !isUnixSocket(info):
 			return nil
 		case !re.MatchString(info.Name()):
 			return nil
diff --git a/cmd/podman/machine/machine_unix.go b/cmd/podman/machine/machine_unix.go
new file mode 100644
index 000000000..b56d081ec
--- /dev/null
+++ b/cmd/podman/machine/machine_unix.go
@@ -0,0 +1,12 @@
+//go:build linux || aix || android || darwin || dragonfly || freebsd || hurd || illumos || ios || netbsd || openbsd || solaris
+// +build linux aix android darwin dragonfly freebsd hurd illumos ios netbsd openbsd solaris
+
+package machine
+
+import (
+	"os"
+)
+
+func isUnixSocket(file os.DirEntry) bool {
+	return file.Type()&os.ModeSocket != 0
+}
diff --git a/cmd/podman/machine/machine_windows.go b/cmd/podman/machine/machine_windows.go
new file mode 100644
index 000000000..ffd5d8827
--- /dev/null
+++ b/cmd/podman/machine/machine_windows.go
@@ -0,0 +1,11 @@
+package machine
+
+import (
+	"os"
+	"strings"
+)
+
+func isUnixSocket(file os.DirEntry) bool {
+	// Assume a socket on Windows, since sock mode is not supported yet https://github.com/golang/go/issues/33357
+	return !file.Type().IsDir() && strings.HasSuffix(file.Name(), ".sock")
+}
diff --git a/pkg/util/utils_windows.go b/pkg/util/utils_windows.go
index 2732124f2..b91680f7a 100644
--- a/pkg/util/utils_windows.go
+++ b/pkg/util/utils_windows.go
@@ -4,6 +4,9 @@
 package util
 
 import (
+	"path/filepath"
+
+	"github.com/containers/storage/pkg/homedir"
 	"github.com/pkg/errors"
 )
 
@@ -34,7 +37,12 @@ func GetRootlessPauseProcessPidPathGivenDir(unused string) (string, error) {
 
 // GetRuntimeDir returns the runtime directory
 func GetRuntimeDir() (string, error) {
-	return "", errors.New("this function is not implemented for windows")
+	data, err := homedir.GetDataHome()
+	if err != nil {
+		return "", err
+	}
+	runtimeDir := filepath.Join(data, "containers", "podman")
+	return runtimeDir, nil
 }
 
 // GetRootlessConfigHomeDir returns the config home directory when running as non root