summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorJason T. Greene <jason.greene@redhat.com>2022-06-30 16:12:09 -0500
committerJason T. Greene <jason.greene@redhat.com>2022-06-30 16:21:59 -0500
commit5262f7e01d61efb0be10aef18067e8fd3bf80179 (patch)
tree11a43f8131db000798ebed07f20b645b8d32521e /cmd
parent01beba3667851c1dd68d3df1e0aa6bc8cb1ec0eb (diff)
downloadpodman-5262f7e01d61efb0be10aef18067e8fd3bf80179.tar.gz
podman-5262f7e01d61efb0be10aef18067e8fd3bf80179.tar.bz2
podman-5262f7e01d61efb0be10aef18067e8fd3bf80179.zip
Fix podman machine on Windows
Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/machine/machine.go9
-rw-r--r--cmd/podman/machine/machine_unix.go11
-rw-r--r--cmd/podman/machine/machine_windows.go9
3 files changed, 20 insertions, 9 deletions
diff --git a/cmd/podman/machine/machine.go b/cmd/podman/machine/machine.go
index d3d44b45e..5a8a06b9d 100644
--- a/cmd/podman/machine/machine.go
+++ b/cmd/podman/machine/machine.go
@@ -5,7 +5,6 @@ package machine
import (
"errors"
- "fmt"
"net"
"os"
"path/filepath"
@@ -18,7 +17,6 @@ import (
"github.com/containers/podman/v4/cmd/podman/validate"
"github.com/containers/podman/v4/libpod/events"
"github.com/containers/podman/v4/pkg/machine"
- "github.com/containers/podman/v4/pkg/rootless"
"github.com/containers/podman/v4/pkg/util"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
@@ -164,10 +162,3 @@ func closeMachineEvents(cmd *cobra.Command, _ []string) error {
}
return nil
}
-
-func rootlessOnly(cmd *cobra.Command, args []string) error {
- if !rootless.IsRootless() {
- return fmt.Errorf("cannot run command %q as root", cmd.CommandPath())
- }
- return nil
-}
diff --git a/cmd/podman/machine/machine_unix.go b/cmd/podman/machine/machine_unix.go
index b56d081ec..a2d9b9d8e 100644
--- a/cmd/podman/machine/machine_unix.go
+++ b/cmd/podman/machine/machine_unix.go
@@ -4,9 +4,20 @@
package machine
import (
+ "fmt"
"os"
+
+ "github.com/containers/podman/v4/pkg/rootless"
+ "github.com/spf13/cobra"
)
func isUnixSocket(file os.DirEntry) bool {
return file.Type()&os.ModeSocket != 0
}
+
+func rootlessOnly(cmd *cobra.Command, args []string) error {
+ if !rootless.IsRootless() {
+ return fmt.Errorf("cannot run command %q as root", cmd.CommandPath())
+ }
+ return nil
+}
diff --git a/cmd/podman/machine/machine_windows.go b/cmd/podman/machine/machine_windows.go
index ffd5d8827..bf1240868 100644
--- a/cmd/podman/machine/machine_windows.go
+++ b/cmd/podman/machine/machine_windows.go
@@ -3,9 +3,18 @@ package machine
import (
"os"
"strings"
+
+ "github.com/spf13/cobra"
)
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")
}
+
+func rootlessOnly(cmd *cobra.Command, args []string) error {
+ // Rootless is not relevant on Windows. In the future rootless.IsRootless
+ // could be switched to return true on Windows, and other codepaths migrated
+
+ return nil
+}