diff options
author | Nicolas Iooss | 2014-11-15 12:14:07 +0100 |
---|---|---|
committer | Nicolas Iooss | 2015-06-27 11:44:58 +0800 |
commit | 5324fc18a5e684975aeff9bedac51c61dff0044d (patch) | |
tree | b5beab7635b81cc9ad7703bb4205350f8fb804c5 /0001-nspawn-ignore-EEXIST-when-creating-mount-point.patch | |
parent | 84ce108e32ccd3d6aa4799fc30467e8dadaf5f03 (diff) | |
download | aur-5324fc18a5e684975aeff9bedac51c61dff0044d.tar.gz |
systemd-selinux 217-6 update
Diffstat (limited to '0001-nspawn-ignore-EEXIST-when-creating-mount-point.patch')
-rw-r--r-- | 0001-nspawn-ignore-EEXIST-when-creating-mount-point.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/0001-nspawn-ignore-EEXIST-when-creating-mount-point.patch b/0001-nspawn-ignore-EEXIST-when-creating-mount-point.patch new file mode 100644 index 000000000000..86817596b20e --- /dev/null +++ b/0001-nspawn-ignore-EEXIST-when-creating-mount-point.patch @@ -0,0 +1,33 @@ +From 1ab19cb167b32967556eefd8f6d3df0e3de7d67d Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Wed, 29 Oct 2014 13:32:43 -0400 +Subject: [PATCH] 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 +--- + src/nspawn/nspawn.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c +index b6d9bc6..d88987a 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; +-- +2.1.2 + |