mirror of
https://github.com/containers/podman.git
synced 2025-12-13 02:09:16 +08:00
Vendor in containers/(storage,image, common, buildah)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
9
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
9
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
@@ -532,6 +532,11 @@ type NetworkConfig struct {
|
||||
|
||||
// NetworkConfigDir is where network configuration files are stored.
|
||||
NetworkConfigDir string `toml:"network_config_dir,omitempty"`
|
||||
|
||||
// DNSBindPort is the port that should be used by dns forwarding daemon
|
||||
// for netavark rootful bridges with dns enabled. This can be necessary
|
||||
// when other dns forwarders run on the machine. 53 is used if unset.
|
||||
DNSBindPort uint16 `toml:"dns_bind_port,omitempty,omitzero"`
|
||||
}
|
||||
|
||||
type SubnetPool struct {
|
||||
@@ -694,7 +699,7 @@ func addConfigs(dirPath string, configs []string) ([]string, error) {
|
||||
}
|
||||
},
|
||||
)
|
||||
if os.IsNotExist(err) {
|
||||
if errors.Is(err, os.ErrNotExist) {
|
||||
err = nil
|
||||
}
|
||||
sort.Strings(newConfigs)
|
||||
@@ -1152,7 +1157,7 @@ func ReadCustomConfig() (*Config, error) {
|
||||
return nil, err
|
||||
}
|
||||
} else {
|
||||
if !os.IsNotExist(err) {
|
||||
if !errors.Is(err, os.ErrNotExist) {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user