diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-03 17:15:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-03 17:15:46 +0100 |
| commit | 4105b025d60dd6d067fa293de11c45dcfd7ea30e (patch) | |
| tree | 8e5f61e3adc5cb03d57a71a1998999d9d7587bb4 /libpod/options.go | |
| parent | a245da1e52b63c451f4683f7a9b225aa49521939 (diff) | |
| parent | 001d48929dcbe4f3a8eeb3db2a7bfdce5a90f81a (diff) | |
| download | podman-4105b025d60dd6d067fa293de11c45dcfd7ea30e.tar.gz podman-4105b025d60dd6d067fa293de11c45dcfd7ea30e.tar.bz2 podman-4105b025d60dd6d067fa293de11c45dcfd7ea30e.zip | |
Merge pull request #12166 from Luap99/mac
MAC address json unmarshal should allow strings
Diffstat (limited to 'libpod/options.go')
| -rw-r--r-- | libpod/options.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/options.go b/libpod/options.go index 135b2f363..f1cf015f8 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -1104,7 +1104,7 @@ func WithNetworkOptions(options map[string][]string) CtrCreateOption { // It cannot be set unless WithNetNS has already been passed. // Further, it cannot be set if additional CNI networks to join have been // specified. -func WithStaticMAC(mac net.HardwareAddr) CtrCreateOption { +func WithStaticMAC(mac nettypes.HardwareAddr) CtrCreateOption { return func(ctr *Container) error { if ctr.valid { return define.ErrCtrFinalized |