diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-05 16:11:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-05 16:11:50 +0200 |
| commit | 337358ae63f5b6c5f73ee399918aa4b7c8059f85 (patch) | |
| tree | 3643893b3e1f53f282cd0f42f3b1d30eec47cf1e /cmd/podman | |
| parent | fff496436e89a290fd37b357419fd0f072ad5e88 (diff) | |
| parent | c23b92b4090d1aab96ddde2c897db8869eb6261e (diff) | |
| download | podman-337358ae63f5b6c5f73ee399918aa4b7c8059f85.tar.gz podman-337358ae63f5b6c5f73ee399918aa4b7c8059f85.tar.bz2 podman-337358ae63f5b6c5f73ee399918aa4b7c8059f85.zip | |
Merge pull request #3690 from adrianreber/ignore-static-ip
restore: added --ignore-static-ip option
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 37d6d3908..d5098ee51 100644 --- a/cmd/podman/cliconfig/config.go +++ b/cmd/podman/cliconfig/config.go @@ -437,6 +437,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) } |