diff options
author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-11-23 15:37:37 -0200 |
---|---|---|
committer | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-11-23 15:37:37 -0200 |
commit | b19aa2f64b1d83caef5baef1c21c3303b5cbd6f9 (patch) | |
tree | fb6fcd42bf1a8df86f9c5e35010d143bd542f2d4 /pcr/systemd-knock/0001-nspawn-ignore-EEXIST-when-creating-mount-point.patch | |
parent | 845f51778cf9597d9625459c2f274b40ddeab1fc (diff) | |
download | abslibre-b19aa2f64b1d83caef5baef1c21c3303b5cbd6f9.tar.gz abslibre-b19aa2f64b1d83caef5baef1c21c3303b5cbd6f9.tar.bz2 abslibre-b19aa2f64b1d83caef5baef1c21c3303b5cbd6f9.zip |
add systemd-knock package
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, 33 insertions, 0 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 new file mode 100644 index 000000000..86817596b --- /dev/null +++ b/pcr/systemd-knock/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 + |