summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRichard Schütz <rschuetz@uni-koblenz.de>2014-11-21 21:44:48 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-22 20:05:19 -0500
commit6c2d07020f752547a8a45b6f03546a61a5e1672d (patch)
treed331283a75a4006448ed52f1215091a95bf208ac /src
parent6e3157c5e64408c01817ffef05a77c8456bef958 (diff)
nspawn: ignore EEXIST when mounting tmpfs
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.
Diffstat (limited to 'src')
-rw-r--r--src/nspawn/nspawn.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index b4dcf39e83..10a520c2db 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;