From 4ba72ecf3a2c073fada50913655bf644aa389561 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 26 Nov 2020 00:26:43 +0000 Subject: [PATCH 1/1] jail: relax /etc/resolv.conf creation Signed-off-by: Daniel Golle --- jail/jail.c | 10 +++++----- 1 file 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; -- 2.30.2