aboutsummaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-02-17 14:26:39 -0500
committerGitHub <noreply@github.com>2022-02-17 14:26:39 -0500
commit93e8c39834edd08c502d18c3d0b96948ec865a37 (patch)
tree4acd6685d8525aa0177f5f819a8d841337ed01ad /libpod
parenta34f27959a6125dc3e27d962cf0ec8715c30eb3b (diff)
parentd59749d64dc0d86a06b953b8fe41bb6d102b8556 (diff)
downloadpodman-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 'libpod')
-rw-r--r--libpod/runtime_ctr.go5
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