diff options
author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2015-05-11 21:35:08 -0300 |
---|---|---|
committer | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2015-05-11 21:35:08 -0300 |
commit | 345b8c4070212e489cfc754155bc8dfea4db17b3 (patch) | |
tree | ad081c796dc4926227ce9b536266fe7c354b9d54 /pcr/systemd-knock/0001-nspawn-ignore-EEXIST-when-creating-mount-point.patch | |
parent | 5b032464a13505085ad85bcc646b5181c11c6bf1 (diff) | |
download | abslibre-345b8c4070212e489cfc754155bc8dfea4db17b3.tar.gz abslibre-345b8c4070212e489cfc754155bc8dfea4db17b3.tar.bz2 abslibre-345b8c4070212e489cfc754155bc8dfea4db17b3.zip |
mv aqsis,blender-addon-ogre,cambozola,cinepaint-lts,collada-dom,gimp-art,gimp-pcr,mednafen-server,mitsuba,nexuiz,nexuiz-data,noip,openssh-knock,python-pygame-hg,supermodel,systemd-knock,tupi,xcftools,yafaray,zoneminder to ssh://git@projects.parabola.nu/~git/pcr.git
Diffstat (limited to 'pcr/systemd-knock/0001-nspawn-ignore-EEXIST-when-creating-mount-point.patch')
-rw-r--r-- | pcr/systemd-knock/0001-nspawn-ignore-EEXIST-when-creating-mount-point.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/pcr/systemd-knock/0001-nspawn-ignore-EEXIST-when-creating-mount-point.patch b/pcr/systemd-knock/0001-nspawn-ignore-EEXIST-when-creating-mount-point.patch deleted file mode 100644 index 86817596b..000000000 --- a/pcr/systemd-knock/0001-nspawn-ignore-EEXIST-when-creating-mount-point.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 - |