chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6e3157c
)
nspawn: ignore EEXIST when mounting tmpfs
author
Richard Schütz
<rschuetz@uni-koblenz.de>
Fri, 21 Nov 2014 20:44:48 +0000
(21:44 +0100)
committer
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Sun, 23 Nov 2014 01:05:19 +0000
(20:05 -0500)
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.
src/nspawn/nspawn.c
patch
|
blob
|
history
diff --git
a/src/nspawn/nspawn.c
b/src/nspawn/nspawn.c
index b4dcf39e83fe924760ae307126bde8b50e448989..10a520c2db2054eaf8194bf9a74cc5ee7dd05deb 100644
(file)
--- 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;