opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 17:38:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10734 from mgoltzsche/fix-dns-detection

Browse Source 
Fix systemd-resolved detection.
This commit is contained in:
OpenShift Merge Robot
2021-06-21 07:06:34 -04:00
committed by GitHub
parent 9ec4d04592 0fb165ed08
commit 18bf92f7ea
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libpod/container_internal_linux.go
View File

@ -1661,10 +1661,14 @@ func (c *Container) generateResolvConf() (string, error) {
// check if systemd-resolved is used, assume it is used when 127.0.0.53 is the only nameserver // check if systemd-resolved is used, assume it is used when 127.0.0.53 is the only nameserver
if len(ns) == 1 && ns[0] == "127.0.0.53" { if len(ns) == 1 && ns[0] == "127.0.0.53" {
// read the actual resolv.conf file for systemd-resolved // read the actual resolv.conf file for systemd-resolved
contents, err = ioutil.ReadFile("/run/systemd/resolve/resolv.conf") resolvedContents, err := ioutil.ReadFile("/run/systemd/resolve/resolv.conf")
if err != nil { if err != nil {
if !os.IsNotExist(err) {
return "", errors.Wrapf(err, "detected that systemd-resolved is in use, but could not locate real resolv.conf") return "", errors.Wrapf(err, "detected that systemd-resolved is in use, but could not locate real resolv.conf")
} }
} else {
contents = resolvedContents
}
} }
ipv6 := false ipv6 := false