diff options
| author | Daniel Golle | 2020-11-26 00:26:43 +0000 |
|---|---|---|
| committer | Daniel Golle | 2020-11-27 01:06:09 +0000 |
| commit | 4ba72ecf3a2c073fada50913655bf644aa389561 (patch) | |
| tree | 49986dd417514b339b7e07b03a3014e58f77adcc | |
| parent | 5abee8f6909b4e4183e65cd730d3107d640a0306 (diff) | |
| download | procd-4ba72ecf3a2c073fada50913655bf644aa389561.tar.gz | |
jail: relax /etc/resolv.conf creation
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
| -rw-r--r-- | jail/jail.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/jail/jail.c b/jail/jail.c index f548b7a..5f1ca6f 100644 --- 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; |