diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-07-13 09:10:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-13 09:10:57 +0000 |
| commit | 4df6122aaa3bc858e9488d366a2c9c91b6671170 (patch) | |
| tree | 9c03ee40d0d7c6cd29c881245a3eb24159f8b10b /cmd/podman/root.go | |
| parent | 6323af78e785f2713497f934f22f5f26719d2175 (diff) | |
| parent | e3419c03245c5639d457cb27f4081cee400f3a36 (diff) | |
| download | podman-4df6122aaa3bc858e9488d366a2c9c91b6671170.tar.gz podman-4df6122aaa3bc858e9488d366a2c9c91b6671170.tar.bz2 podman-4df6122aaa3bc858e9488d366a2c9c91b6671170.zip | |
Merge pull request #14904 from giuseppe/move-to-subcgroup-in-a-container
abi: create new cgroup when running in a container
Diffstat (limited to 'cmd/podman/root.go')
| -rw-r--r-- | cmd/podman/root.go | 3 |
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 { |