Merge pull request #8111 from Luap99/fix-missing-resolv.conf

Don't error if resolv.conf does not exists
containers · Oct 22, 2020 · 2adc1b2 · 2adc1b2
2 parents 8e06f8e + f391849
commit 2adc1b2
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
@@ -1412,7 +1412,8 @@ func (c *Container) generateResolvConf() (string, error) {
 
 	// Determine the endpoint for resolv.conf in case it is a symlink
 	resolvPath, err := filepath.EvalSymlinks(resolvConf)
-	if err != nil {
+	// resolv.conf doesn't have to exists
+	if err != nil && !os.IsNotExist(err) {
 		return "", err
 	}
 
@@ -1422,7 +1423,8 @@ func (c *Container) generateResolvConf() (string, error) {
 	}
 
 	contents, err := ioutil.ReadFile(resolvPath)
-	if err != nil {
+	// resolv.conf doesn't have to exists
+	if err != nil && !os.IsNotExist(err) {
 		return "", errors.Wrapf(err, "unable to read %s", resolvPath)
 	}