diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-19 02:38:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-19 02:38:26 +0200 |
| commit | deb087d7b173832138c2e46ab4b7b626a98a910c (patch) | |
| tree | a9d93d164fe83ba7229d17fd593639b7883fd8a2 /cmd/podman/restore.go | |
| parent | b59abdc1b1cf72d86d3fe6bb76ba646870c86ed6 (diff) | |
| parent | c70657a6d1fc15ba60d4bb0fc197f4c70fa59cac (diff) | |
| download | podman-deb087d7b173832138c2e46ab4b7b626a98a910c.tar.gz podman-deb087d7b173832138c2e46ab4b7b626a98a910c.tar.bz2 podman-deb087d7b173832138c2e46ab4b7b626a98a910c.zip | |
Merge pull request #3443 from adrianreber/rootfs-changes-migration
Include changes to the container's root file-system in the checkpoint archive
Diffstat (limited to 'cmd/podman/restore.go')
| -rw-r--r-- | cmd/podman/restore.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cmd/podman/restore.go b/cmd/podman/restore.go index c4146eff0..3ae141d41 100644 --- a/cmd/podman/restore.go +++ b/cmd/podman/restore.go @@ -45,6 +45,7 @@ func init() { flags.BoolVar(&restoreCommand.TcpEstablished, "tcp-established", false, "Restore a container with established TCP connections") flags.StringVarP(&restoreCommand.Import, "import", "i", "", "Restore from exported checkpoint archive (tar.gz)") flags.StringVarP(&restoreCommand.Name, "name", "n", "", "Specify new name for container restored from exported checkpoint (only works with --import)") + flags.BoolVar(&restoreCommand.IgnoreRootfs, "ignore-rootfs", false, "Do not apply root file-system changes when importing from exported checkpoint") markFlagHiddenForRemoteClient("latest", flags) } @@ -60,8 +61,12 @@ func restoreCmd(c *cliconfig.RestoreValues, cmd *cobra.Command) error { } defer runtime.DeferredShutdown(false) + if c.Import == "" && c.IgnoreRootfs { + return errors.Errorf("--ignore-rootfs can only be used with --import") + } + if c.Import == "" && c.Name != "" { - return errors.Errorf("--name can only used with --import") + return errors.Errorf("--name can only be used with --import") } if c.Name != "" && c.TcpEstablished { |