diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-07-27 20:46:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-27 20:46:46 +0200 |
| commit | a6a0f6c192a63f1b0ae6790bc88eb93bd6b7718c (patch) | |
| tree | a21d60ff1efd78acd03895de0ca27ff754af39fa /cmd/podman/root.go | |
| parent | b6c279be2296ce32fbb36ba39bd948f93be9bede (diff) | |
| parent | 63ef5576ed6e99dca3dfef8e8fb6efb5564839a2 (diff) | |
| download | podman-a6a0f6c192a63f1b0ae6790bc88eb93bd6b7718c.tar.gz podman-a6a0f6c192a63f1b0ae6790bc88eb93bd6b7718c.tar.bz2 podman-a6a0f6c192a63f1b0ae6790bc88eb93bd6b7718c.zip | |
Merge pull request #11061 from giuseppe/migrate-no-move-to-cgroup
command: migrate doesn't move process to cgroup
Diffstat (limited to 'cmd/podman/root.go')
| -rw-r--r-- | cmd/podman/root.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podman/root.go b/cmd/podman/root.go index 2633e4040..dc4ebb952 100644 --- a/cmd/podman/root.go +++ b/cmd/podman/root.go @@ -208,7 +208,8 @@ func persistentPreRunE(cmd *cobra.Command, args []string) error { // 3) command doesn't require Parent Namespace _, found := cmd.Annotations[registry.ParentNSRequired] if !registry.IsRemote() && rootless.IsRootless() && !found { - err := registry.ContainerEngine().SetupRootless(registry.Context(), cmd) + _, noMoveProcess := cmd.Annotations[registry.NoMoveProcess] + err := registry.ContainerEngine().SetupRootless(registry.Context(), noMoveProcess) if err != nil { return err } |