diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-02-17 14:26:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-17 14:26:39 -0500 |
| commit | 93e8c39834edd08c502d18c3d0b96948ec865a37 (patch) | |
| tree | 4acd6685d8525aa0177f5f819a8d841337ed01ad /pkg/checkpoint | |
| parent | a34f27959a6125dc3e27d962cf0ec8715c30eb3b (diff) | |
| parent | d59749d64dc0d86a06b953b8fe41bb6d102b8556 (diff) | |
| download | podman-93e8c39834edd08c502d18c3d0b96948ec865a37.tar.gz podman-93e8c39834edd08c502d18c3d0b96948ec865a37.tar.bz2 podman-93e8c39834edd08c502d18c3d0b96948ec865a37.zip | |
Merge pull request #13255 from mheon/bump_400_final
Bump to v4.0.0 final
Diffstat (limited to 'pkg/checkpoint')
| -rw-r--r-- | pkg/checkpoint/checkpoint_restore.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkg/checkpoint/checkpoint_restore.go b/pkg/checkpoint/checkpoint_restore.go index 1ebd6a455..270b5b6c4 100644 --- a/pkg/checkpoint/checkpoint_restore.go +++ b/pkg/checkpoint/checkpoint_restore.go @@ -140,6 +140,13 @@ func CRImportCheckpoint(ctx context.Context, runtime *libpod.Runtime, restoreOpt return nil, errors.Errorf("pod %s does not share the network namespace", ctrConfig.Pod) } ctrConfig.NetNsCtr = infraContainer.ID() + for net, opts := range ctrConfig.Networks { + opts.StaticIPs = nil + opts.StaticMAC = nil + ctrConfig.Networks[net] = opts + } + ctrConfig.StaticIP = nil + ctrConfig.StaticMAC = nil } if ctrConfig.PIDNsCtr != "" { |