mirror of
https://github.com/containers/podman.git
synced 2025-12-06 05:37:49 +08:00
vendor c/common@852ca05a1f
Also force an update of c/image to prevent a downgrade. Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
This commit is contained in:
1
vendor/github.com/containers/common/libnetwork/cni/config.go
generated
vendored
1
vendor/github.com/containers/common/libnetwork/cni/config.go
generated
vendored
@@ -86,6 +86,7 @@ func (n *cniNetwork) networkCreate(newNetwork *types.Network, defaultNet bool) (
|
||||
|
||||
switch newNetwork.Driver {
|
||||
case types.BridgeNetworkDriver:
|
||||
internalutil.MapDockerBridgeDriverOptions(newNetwork)
|
||||
err = internalutil.CreateBridge(n, newNetwork, usedNetworks, n.defaultsubnetPools)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
2
vendor/github.com/containers/common/libnetwork/cni/network.go
generated
vendored
2
vendor/github.com/containers/common/libnetwork/cni/network.go
generated
vendored
@@ -44,7 +44,7 @@ type cniNetwork struct {
|
||||
isMachine bool
|
||||
|
||||
// lock is a internal lock for critical operations
|
||||
lock lockfile.Locker
|
||||
lock *lockfile.LockFile
|
||||
|
||||
// modTime is the timestamp when the config dir was modified
|
||||
modTime time.Time
|
||||
|
||||
Reference in New Issue
Block a user