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

Merge pull request #7616 from EduardoVega/5845-support-for-systemd-resolved

Browse Source 
Determine if resolv.conf points to systemd-resolved
This commit is contained in:
OpenShift Merge Robot
2020-09-14 03:45:20 -04:00
committed by GitHub
parent 3f5f99b883 6a1233597a
commit b7936b552f
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libpod/container_internal_linux.go
View File

@ -1383,6 +1383,11 @@ func (c *Container) generateResolvConf() (string, error) {
return "", err return "", err
} }
// Determine if symlink points to any of the systemd-resolved files
if strings.HasPrefix(resolvPath, "/run/systemd/resolve/") {
resolvPath = "/run/systemd/resolve/resolv.conf"
}
contents, err := ioutil.ReadFile(resolvPath) contents, err := ioutil.ReadFile(resolvPath)
if err != nil { if err != nil {
return "", errors.Wrapf(err, "unable to read %s", resolvPath) return "", errors.Wrapf(err, "unable to read %s", resolvPath)