diff options
| author | Adrian Reber <areber@redhat.com> | 2019-08-01 17:23:02 +0000 |
|---|---|---|
| committer | Adrian Reber <areber@redhat.com> | 2019-08-02 10:10:54 +0200 |
| commit | c23b92b4090d1aab96ddde2c897db8869eb6261e (patch) | |
| tree | 177a3b86284af7c0bfcf260e687d3c32ba955304 /cmd/podman | |
| parent | afb493ae9b1cc98db1f6d9a211b561bb245692de (diff) | |
| download | podman-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 'cmd/podman')
| -rw-r--r-- | cmd/podman/cliconfig/config.go | 1 | ||||
| -rw-r--r-- | cmd/podman/restore.go | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/cmd/podman/cliconfig/config.go b/cmd/podman/cliconfig/config.go index 025f40cf6..ef028093e 100644 --- a/cmd/podman/cliconfig/config.go +++ b/cmd/podman/cliconfig/config.go @@ -436,6 +436,7 @@ type RestoreValues struct { Import string Name string IgnoreRootfs bool + IgnoreStaticIP bool } type RmValues struct { diff --git a/cmd/podman/restore.go b/cmd/podman/restore.go index 3ae141d41..90d0b2dc4 100644 --- a/cmd/podman/restore.go +++ b/cmd/podman/restore.go @@ -46,6 +46,7 @@ func init() { 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") + flags.BoolVar(&restoreCommand.IgnoreStaticIP, "ignore-static-ip", false, "Ignore IP address set via --static-ip") markFlagHiddenForRemoteClient("latest", flags) } |