summaryrefslogtreecommitdiff
path: root/pkg/adapter
diff options
context:
space:
mode:
authorAdrian Reber <areber@redhat.com>2019-08-01 17:23:02 +0000
committerAdrian Reber <areber@redhat.com>2019-08-02 10:10:54 +0200
commitc23b92b4090d1aab96ddde2c897db8869eb6261e (patch)
tree177a3b86284af7c0bfcf260e687d3c32ba955304 /pkg/adapter
parentafb493ae9b1cc98db1f6d9a211b561bb245692de (diff)
downloadpodman-c23b92b4090d1aab96ddde2c897db8869eb6261e.tar.gz
podman-c23b92b4090d1aab96ddde2c897db8869eb6261e.tar.bz2
podman-c23b92b4090d1aab96ddde2c897db8869eb6261e.zip
restore: added --ignore-static-ip option
If a container is restored multiple times from an exported checkpoint with the help of '--import --name', the restore will fail if during 'podman run' a static container IP was set with '--ip'. The user can tell the restore process to ignore the static IP with '--ignore-static-ip'. Signed-off-by: Adrian Reber <areber@redhat.com>
Diffstat (limited to 'pkg/adapter')
-rw-r--r--pkg/adapter/containers.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkg/adapter/containers.go b/pkg/adapter/containers.go
index faaef3e60..967c79505 100644
--- a/pkg/adapter/containers.go
+++ b/pkg/adapter/containers.go
@@ -565,6 +565,7 @@ func (r *LocalRuntime) Restore(ctx context.Context, c *cliconfig.RestoreValues)
TargetFile: c.Import,
Name: c.Name,
IgnoreRootfs: c.IgnoreRootfs,
+ IgnoreStaticIP: c.IgnoreStaticIP,
}
filterFuncs = append(filterFuncs, func(c *libpod.Container) bool {