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

…solved Determine if resolv.conf points to systemd-resolved
containers · Sep 14, 2020 · b7936b5 · b7936b5
2 parents 3f5f99b + 6a12335
commit b7936b5
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
@@ -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)