[systemd-devel] [PATCH] nspawn: ignore EEXIST when mounting tmpfs

[Zbigniew Jędrzejewski-Szmek]

On Fri, Nov 21, 2014 at 09:44:48PM +0100, Richard Schütz wrote:
> commit 79d80fc1466512d0ca211f4bfcd9de5f2f816a5a introduced a regression that
> prevents mounting a tmpfs if the mount point already exits in the container's
> root file system. This commit fixes the problem by ignoring EEXIST.
> ---
Thanks, applied.

Zbyszek

>  src/nspawn/nspawn.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
> index b4dcf39..10a520c 100644
> --- a/src/nspawn/nspawn.c
> +++ b/src/nspawn/nspawn.c
> @@ -828,7 +828,7 @@ static int mount_tmpfs(const char *dest) {
>                          return log_oom();
>  
>                  r = mkdir_label(where, 0755);
> -                if (r < 0) {
> +                if (r < 0 && errno != EEXIST) {
>                          log_error("creating mount point for tmpfs %s failed: %s", where, strerror(-r));
>  
>                          return r;
> -- 
> 2.1.3
> 
> _______________________________________________
> systemd-devel mailing list
> systemd-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/systemd-devel