diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2014-10-29 13:32:43 -0400 |
|---|---|---|
| committer | Dave Reisner <dreisner@archlinux.org> | 2014-10-29 13:42:51 -0400 |
| commit | 1ab19cb167b32967556eefd8f6d3df0e3de7d67d (patch) | |
| tree | e3e5cf32ad2010decafd6c666c8ebd102dcee1e8 | |
| parent | ef7b6c0190fefaacf6d8f8e1a6dda4ba8b98091b (diff) | |
nspawn: ignore EEXIST when creating mount point
A combination of commits f3c80515c and 79d80fc14 cause nspawn to
silently fail with a commandline such as:
# systemd-nspawn -D /build/extra-x86_64 --bind=/usr
strace shows the culprit:
[pid 27868] writev(2, [{"Failed to create mount point /build/extra-x86_64/usr: File exists", 82}, {"\n", 1}], 2) = 83
| -rw-r--r-- | src/nspawn/nspawn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index b6d9bc631c..d88987a580 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -758,7 +758,7 @@ static int mount_binds(const char *dest, char **l, bool ro) { * and char devices. */ if (S_ISDIR(source_st.st_mode)) { r = mkdir_label(where, 0755); - if (r < 0) { + if (r < 0 && errno != EEXIST) { log_error("Failed to create mount point %s: %s", where, strerror(-r)); return r; |