summaryrefslogtreecommitdiff
path: root/cmd/podman/root.go
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2022-07-12 11:47:30 +0200
committerMatthew Heon <matthew.heon@pm.me>2022-07-26 13:08:11 -0400
commit7b4ebfa657d605d0767be7ccb2607c923ce4311f (patch)
tree7326ed01c4c543029412e11775a30ccdbc3ab7db /cmd/podman/root.go
parent3b37095b2b91f6e67db6195af685ce88e7a2519a (diff)
downloadpodman-7b4ebfa657d605d0767be7ccb2607c923ce4311f.tar.gz
podman-7b4ebfa657d605d0767be7ccb2607c923ce4311f.tar.bz2
podman-7b4ebfa657d605d0767be7ccb2607c923ce4311f.zip
podman: always call into SetupRootless
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'cmd/podman/root.go')
-rw-r--r--cmd/podman/root.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/cmd/podman/root.go b/cmd/podman/root.go
index f28d92e2f..0520a0784 100644
--- a/cmd/podman/root.go
+++ b/cmd/podman/root.go
@@ -19,7 +19,6 @@ import (
"github.com/containers/podman/v4/pkg/checkpoint/crutils"
"github.com/containers/podman/v4/pkg/domain/entities"
"github.com/containers/podman/v4/pkg/parallel"
- "github.com/containers/podman/v4/pkg/rootless"
"github.com/containers/podman/v4/version"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
@@ -265,7 +264,7 @@ func persistentPreRunE(cmd *cobra.Command, args []string) error {
// 2) running as non-root
// 3) command doesn't require Parent Namespace
_, found := cmd.Annotations[registry.ParentNSRequired]
- if !registry.IsRemote() && rootless.IsRootless() && !found {
+ if !registry.IsRemote() && !found {
_, noMoveProcess := cmd.Annotations[registry.NoMoveProcess]
err := registry.ContainerEngine().SetupRootless(registry.Context(), noMoveProcess)
if err != nil {