systemd-nspawn: Ignore existing directories when trying to create mount-points (#4989)

2014-11-24 22:11:37 +01:00 · 2014-11-24 22:11:37 +01:00 · b216e2b8e6
parent d39c6ceffc
commit b216e2b8e6
1 changed files with 9 additions and 0 deletions
--- a/pkgs/os-specific/linux/systemd/fixes.patch
+++ b/pkgs/os-specific/linux/systemd/fixes.patch
@ -44,6 +44,15 @@ diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
 index b6d9bc6..04fbe57 100644
 --- a/src/nspawn/nspawn.c
 +++ b/src/nspawn/nspawn.c
+@@ -758,7 +758,7 @@ static int mount_binds(const char *dest,
+                  * and char devices. */
+                 if (S_ISDIR(source_st.st_mode)) {
+                         r = mkdir_label(where, 0755);
+-                        if (r < 0) {
+                        if (r < 0 && r != -EEXIST) {
+                                 log_error("Failed to create mount point %s: %s", where, strerror(-r));
+
+                                 return r;
@@ -3073,6 +3073,7 @@ int main(int argc, char *argv[]) {
                                 goto finish;
                         }