diff options
| author |   Richard Schütz <rschuetz@uni-koblenz.de> | 2014-11-21 21:44:48 +0100 |
|---|---|---|
| committer |   Mike Gilbert <floppym@gentoo.org> | 2014-11-23 13:23:15 -0500 |
| commit | cfa70f81ccdd93c53d80bdd31a278eff2f145f95 (patch) | |
| tree | 21297cb65b20af43cf221ed3696d4e77b7d82030 | |
| parent | selinux-access: fix broken ternary operator (diff) | |
| download | systemd-gentoo-217.tar.gz systemd-gentoo-217.tar.bz2 systemd-gentoo-217.zip | |
nspawn: ignore EEXIST when mounting tmpfsgentoo-217
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.
| -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 d88987a58..0bffd99e0 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -818,7 +818,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; |