mirror of
https://github.com/containers/podman.git
synced 2025-12-05 21:32:22 +08:00
vendor: bump c/common to 9b0d134f392
Bump common to 9b0d134f392f41de3f3065aad162e73a3904168e Signed-off-by: flouthoc <flouthoc.git@gmail.com>
This commit is contained in:
5
vendor/github.com/containers/common/libnetwork/netavark/config.go
generated
vendored
5
vendor/github.com/containers/common/libnetwork/netavark/config.go
generated
vendored
@@ -294,10 +294,7 @@ func createIpvlanOrMacvlan(network *types.Network) error {
|
||||
}
|
||||
|
||||
driver := network.Driver
|
||||
isMacVlan := true
|
||||
if driver == types.IPVLANNetworkDriver {
|
||||
isMacVlan = false
|
||||
}
|
||||
isMacVlan := driver != types.IPVLANNetworkDriver
|
||||
|
||||
// always turn dns off with macvlan, it is not implemented in netavark
|
||||
// and makes little sense to support with macvlan
|
||||
|
||||
2
vendor/github.com/containers/common/libnetwork/netavark/network.go
generated
vendored
2
vendor/github.com/containers/common/libnetwork/netavark/network.go
generated
vendored
@@ -248,7 +248,7 @@ func (n *netavarkNetwork) loadNetworks() error {
|
||||
}
|
||||
|
||||
if !types.NameRegex.MatchString(network.Name) {
|
||||
logrus.Warnf("Network config %q has invalid name: %q, skipping: %v", path, network.Name, types.RegexError)
|
||||
logrus.Warnf("Network config %q has invalid name: %q, skipping: %v", path, network.Name, types.ErrInvalidName)
|
||||
continue
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user