mirror of
https://github.com/containers/podman.git
synced 2025-10-16 10:43:52 +08:00
update c/common to latest main
Contains the resolv.conf setup changes. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
26
vendor/github.com/containers/common/libnetwork/resolvconf/resolv.go
generated
vendored
26
vendor/github.com/containers/common/libnetwork/resolvconf/resolv.go
generated
vendored
@ -30,17 +30,28 @@ type Params struct {
|
||||
// IPv6Enabled will filter ipv6 nameservers when not set to true.
|
||||
IPv6Enabled bool
|
||||
// KeepHostServers can be set when it is required to still keep the
|
||||
// original resolv.conf content even when custom Nameserver/Searches/Options
|
||||
// original resolv.conf nameservers even when explicit Nameservers
|
||||
// are set. In this case they will be appended to the given values.
|
||||
KeepHostServers bool
|
||||
// KeepHostSearches can be set when it is required to still keep the
|
||||
// original resolv.conf search domains even when explicit search domains
|
||||
// are set in Searches.
|
||||
KeepHostSearches bool
|
||||
// KeepHostOptions can be set when it is required to still keep the
|
||||
// original resolv.conf options even when explicit options are set in
|
||||
// Options.
|
||||
KeepHostOptions bool
|
||||
// Nameservers is a list of nameservers the container should use,
|
||||
// instead of the default ones from the host.
|
||||
// instead of the default ones from the host. Set KeepHostServers
|
||||
// in order to also keep the hosts resolv.conf nameservers.
|
||||
Nameservers []string
|
||||
// Searches is a list of dns search domains the container should use,
|
||||
// instead of the default ones from the host.
|
||||
// instead of the default ones from the host. Set KeepHostSearches
|
||||
// in order to also keep the hosts resolv.conf search domains.
|
||||
Searches []string
|
||||
// Options is a list of dns options the container should use,
|
||||
// instead of the default ones from the host.
|
||||
// instead of the default ones from the host. Set KeepHostOptions
|
||||
// in order to also keep the hosts resolv.conf options.
|
||||
Options []string
|
||||
|
||||
// resolvConfPath is the path which should be used as base to get the dns
|
||||
@ -121,7 +132,8 @@ func unsetSearchDomainsIfNeeded(searches []string) []string {
|
||||
// New creates a new resolv.conf file with the given params.
|
||||
func New(params *Params) error {
|
||||
// short path, if everything is given there is no need to actually read the hosts /etc/resolv.conf
|
||||
if len(params.Nameservers) > 0 && len(params.Options) > 0 && len(params.Searches) > 0 && !params.KeepHostServers {
|
||||
if len(params.Nameservers) > 0 && len(params.Options) > 0 && len(params.Searches) > 0 &&
|
||||
!params.KeepHostServers && !params.KeepHostOptions && !params.KeepHostSearches {
|
||||
return build(params.Path, params.Nameservers, unsetSearchDomainsIfNeeded(params.Searches), params.Options)
|
||||
}
|
||||
|
||||
@ -140,12 +152,12 @@ func New(params *Params) error {
|
||||
searches := unsetSearchDomainsIfNeeded(params.Searches)
|
||||
// if no params.Searches then use host ones
|
||||
// otherwise make sure that they were no explicitly unset before adding host ones
|
||||
if len(params.Searches) == 0 || (params.KeepHostServers && len(searches) > 0) {
|
||||
if len(params.Searches) == 0 || (params.KeepHostSearches && len(searches) > 0) {
|
||||
searches = append(searches, getSearchDomains(content)...)
|
||||
}
|
||||
|
||||
options := params.Options
|
||||
if len(options) == 0 || params.KeepHostServers {
|
||||
if len(options) == 0 || params.KeepHostOptions {
|
||||
options = append(options, getOptions(content)...)
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user