erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-10-29 17:27:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

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
commit b7936b552f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show stats 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
}
// 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)
if err != nil {
return "", errors.Wrapf(err, "unable to read %s", resolvPath)