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 /pkg/adapter/containers.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 'pkg/adapter/containers.go')
-rw-r--r-- | pkg/adapter/containers.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkg/adapter/containers.go b/pkg/adapter/containers.go index 86e9c0266..7e2384e18 100644 --- a/pkg/adapter/containers.go +++ b/pkg/adapter/containers.go @@ -524,6 +524,10 @@ func (r *LocalRuntime) Checkpoint(c *cliconfig.CheckpointValues) error { KeepRunning: c.LeaveRunning, TCPEstablished: c.TcpEstablished, TargetFile: c.Export, + IgnoreRootfs: c.IgnoreRootfs, + } + if c.Export == "" && c.IgnoreRootfs { + return errors.Errorf("--ignore-rootfs can only be used with --export") } if c.All { containers, err = r.Runtime.GetRunningContainers() @@ -560,6 +564,7 @@ func (r *LocalRuntime) Restore(ctx context.Context, c *cliconfig.RestoreValues) TCPEstablished: c.TcpEstablished, TargetFile: c.Import, Name: c.Name, + IgnoreRootfs: c.IgnoreRootfs, } filterFuncs = append(filterFuncs, func(c *libpod.Container) bool { |