diff options
| author | Adrian Reber <areber@redhat.com> | 2019-12-04 15:06:51 +0000 |
|---|---|---|
| committer | Adrian Reber <areber@redhat.com> | 2019-12-09 13:29:36 +0100 |
| commit | 225c7ae6c98300fc8d9536fa31c0ae9f8231c5c0 (patch) | |
| tree | c84b22b8fb5ac6ee45d6ff1fb19f6ab1505969f3 /pkg | |
| parent | 7287f69b52e5bcb59f9977b261ee488942465ecb (diff) | |
| download | podman-225c7ae6c98300fc8d9536fa31c0ae9f8231c5c0.tar.gz podman-225c7ae6c98300fc8d9536fa31c0ae9f8231c5c0.tar.bz2 podman-225c7ae6c98300fc8d9536fa31c0ae9f8231c5c0.zip | |
Correctly export the root file-system changes
When doing a checkpoint with --export the root file-system diff was not
working as expected. Instead of getting the changes from the running
container to the highest storage layer it got the changes from the
highest layer to that parent's layer. For a one layer container this
could mean that the complete root file-system is part of the checkpoint.
With this commit this changes to use the same functionality as 'podman
diff'. This actually enables to correctly diff the root file-system
including tracking deleted files.
This also removes the non-working helper functions from libpod/diff.go.
Signed-off-by: Adrian Reber <areber@redhat.com>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/adapter/checkpoint_restore.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkg/adapter/checkpoint_restore.go b/pkg/adapter/checkpoint_restore.go index 15f9e8105..7f80b782a 100644 --- a/pkg/adapter/checkpoint_restore.go +++ b/pkg/adapter/checkpoint_restore.go @@ -60,6 +60,7 @@ func crImportCheckpoint(ctx context.Context, runtime *libpod.Runtime, input stri "ctr.log", "rootfs-diff.tar", "network.status", + "deleted.files", }, } dir, err := ioutil.TempDir("", "checkpoint") |