jail: relax /etc/resolv.conf creation

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/jail/jail.c b/jail/jail.c
index f548b7a964bbd7eba369a16b3f737cfebb210ae8..5f1ca6fa2d6e1c63ce8ffb9da0984531ceed2c54 100644 (file)
--- a/jail/jail.c
+++ b/jail/jail.c
@@ -315,15 +315,15 @@ static int mount_overlay(char *jail_root, char *overlaydir) {
 
        fd = creat(upperresolvconf, 0644);
        if (fd == -1) {
-               ERROR("creat(%s) failed: %m\n", upperresolvconf);
-               goto upper_resolvconf_printf;
+               if (errno != EEXIST)
+                       ERROR("creat(%s) failed: %m\n", upperresolvconf);
+       } else {
+               close(fd);
        }
-       close(fd);
-
        DEBUG("mount -t overlay %s %s (%s)\n", jail_root, jail_root, optsstr);
 
        if (mount(jail_root, jail_root, "overlay", MS_NOATIME, optsstr))
-               goto opts_printf;
+               goto upper_resolvconf_printf;
 
        ret = 0;