summaryrefslogtreecommitdiff
path: root/cmd/podman/system_migrate.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-10-11 19:56:13 +0200
committerGitHub <noreply@github.com>2019-10-11 19:56:13 +0200
commitcee6478f9e5e5cdbfe3df8f4894e416e4c5926e4 (patch)
tree2936df1d29e417d4ab4e7a22802ed75f31591acc /cmd/podman/system_migrate.go
parenteb6ca054fc93e5f863581e72923cb1e80fc5ab88 (diff)
parentfeba94eb95f93fd571efff039cb7d7cdb5139169 (diff)
downloadpodman-cee6478f9e5e5cdbfe3df8f4894e416e4c5926e4.tar.gz
podman-cee6478f9e5e5cdbfe3df8f4894e416e4c5926e4.tar.bz2
podman-cee6478f9e5e5cdbfe3df8f4894e416e4c5926e4.zip
Merge pull request #4221 from mheon/reset_runtime
Migrate can move containers to a user-defined runtime
Diffstat (limited to 'cmd/podman/system_migrate.go')
-rw-r--r--cmd/podman/system_migrate.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/cmd/podman/system_migrate.go b/cmd/podman/system_migrate.go
index 4a0afcfad..9c90aeb52 100644
--- a/cmd/podman/system_migrate.go
+++ b/cmd/podman/system_migrate.go
@@ -32,13 +32,15 @@ func init() {
migrateCommand.Command = _migrateCommand
migrateCommand.SetHelpTemplate(HelpTemplate())
migrateCommand.SetUsageTemplate(UsageTemplate())
+ flags := migrateCommand.Flags()
+ flags.StringVar(&migrateCommand.NewRuntime, "new-runtime", "", "Specify a new runtime for all containers")
}
func migrateCmd(c *cliconfig.SystemMigrateValues) error {
// We need to pass one extra option to NewRuntime.
// This will inform the OCI runtime to start a migrate.
// That's controlled by the last argument to GetRuntime.
- r, err := libpodruntime.GetRuntimeMigrate(getContext(), &c.PodmanCommand)
+ r, err := libpodruntime.GetRuntimeMigrate(getContext(), &c.PodmanCommand, c.NewRuntime)
if err != nil {
return errors.Wrapf(err, "error migrating containers")
}