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/system | |
| 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/system')
| -rw-r--r-- | cmd/podman/system/migrate.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmd/podman/system/migrate.go b/cmd/podman/system/migrate.go index 9940cd063..b9dc272d7 100644 --- a/cmd/podman/system/migrate.go +++ b/cmd/podman/system/migrate.go @@ -22,7 +22,10 @@ var ( ` migrateCommand = &cobra.Command{ - Annotations: map[string]string{registry.EngineMode: registry.ABIMode}, + Annotations: map[string]string{ + registry.EngineMode: registry.ABIMode, + registry.NoMoveProcess: registry.NoMoveProcess, + }, Use: "migrate [options]", Args: validate.NoArgs, Short: "Migrate containers", |