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/common | |
| 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/common')
| -rw-r--r-- | cmd/podman/common/completion.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmd/podman/common/completion.go b/cmd/podman/common/completion.go index 6e6c33f9b..02369c74a 100644 --- a/cmd/podman/common/completion.go +++ b/cmd/podman/common/completion.go @@ -18,7 +18,6 @@ import ( "github.com/containers/podman/v4/libpod/define" "github.com/containers/podman/v4/libpod/events" "github.com/containers/podman/v4/pkg/domain/entities" - "github.com/containers/podman/v4/pkg/rootless" "github.com/containers/podman/v4/pkg/signal" systemdDefine "github.com/containers/podman/v4/pkg/systemd/define" "github.com/containers/podman/v4/pkg/util" @@ -54,7 +53,7 @@ func setupContainerEngine(cmd *cobra.Command) (entities.ContainerEngine, error) cobra.CompErrorln(err.Error()) return nil, err } - if !registry.IsRemote() && rootless.IsRootless() { + if !registry.IsRemote() { _, noMoveProcess := cmd.Annotations[registry.NoMoveProcess] err := containerEngine.SetupRootless(registry.Context(), noMoveProcess) |