diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-18 12:19:57 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-18 12:19:57 +0100 |
commit | e4e92d6104cc5d60b2e771d2d8fbab61e96748a9 (patch) | |
tree | c5227aac15526a287ea5de2f30b0550ad60da3b2 /libpod/define/pod_inspect.go | |
parent | a6f7afd41729edbe0d8cbf21bab5b475c6a13f9e (diff) | |
parent | 76a38fc3f236f9197ab0761d5cc11cb37cee5e41 (diff) | |
download | podman-e4e92d6104cc5d60b2e771d2d8fbab61e96748a9.tar.gz podman-e4e92d6104cc5d60b2e771d2d8fbab61e96748a9.tar.bz2 podman-e4e92d6104cc5d60b2e771d2d8fbab61e96748a9.zip |
Merge pull request #8386 from zhangguanzhang/pod-inspect-mac
Fix podman pod inspect show wrong StaticMAC
Diffstat (limited to 'libpod/define/pod_inspect.go')
-rw-r--r-- | libpod/define/pod_inspect.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/define/pod_inspect.go b/libpod/define/pod_inspect.go index a4115eb92..2fa91166f 100644 --- a/libpod/define/pod_inspect.go +++ b/libpod/define/pod_inspect.go @@ -67,7 +67,7 @@ type InspectPodInfraConfig struct { StaticIP net.IP // StaticMAC is a static MAC address that will be assigned to the infra // container and then used by the pod. - StaticMAC net.HardwareAddr + StaticMAC string // NoManageResolvConf indicates that the pod will not manage resolv.conf // and instead each container will handle their own. NoManageResolvConf bool |