diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-02-11 16:46:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-11 16:46:08 -0500 |
| commit | 1b22ad95c172acc70af0a7c2d2145aa02353c02b (patch) | |
| tree | 3b4f73a7185ba5cd844e099fccc3c87e894e09f9 /libpod/runtime_ctr.go | |
| parent | 564404b4fa7eea5d93756627ce98ca68fd19a72b (diff) | |
| parent | 4b90542d5be977db79abbbfc442aca3553024246 (diff) | |
| download | podman-1b22ad95c172acc70af0a7c2d2145aa02353c02b.tar.gz podman-1b22ad95c172acc70af0a7c2d2145aa02353c02b.tar.bz2 podman-1b22ad95c172acc70af0a7c2d2145aa02353c02b.zip | |
Merge pull request #13214 from adrianreber/2022-02-11-fix-tests
Fix checkpoint/restore pod tests
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 3799b463f..44364100e 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -192,6 +192,11 @@ func (r *Runtime) initContainerVariables(rSpec *spec.Spec, config *ContainerConf } // Reset the log path to point to the default ctr.config.LogPath = "" + // Later in validate() the check is for nil. JSONDeepCopy sets it to an empty + // object. Resetting it to nil if it was nil before. + if config.StaticMAC == nil { + ctr.config.StaticMAC = nil + } } ctr.config.Spec = rSpec |