fix(sys-apps/systemd) add mkdir bugfix from @philips

This commit is contained in:
Greg Kroah-Hartman 2014-03-13 23:13:13 +00:00
parent 99ab86de80
commit 082e4ab8c5
2 changed files with 29 additions and 0 deletions

View File

@ -0,0 +1,28 @@
From aca07d5e53da1970b31907fc07237800424e84f1 Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon.philips@coreos.com>
Date: Thu, 13 Mar 2014 15:19:40 -0700
Subject: [PATCH] nspawn: allow -EEXIST on mkdir_safe /home/${uid}
With systemd 211 nspawn attempts to create the home directory for the
given uid. However, if the home directory already exists then it will
fail. Don't error out on -EEXIST.
---
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 b637b51..7c3d7b8 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -2543,7 +2543,7 @@ static int change_uid_gid(char **_home) {
}
r = mkdir_safe(home, 0755, uid, gid);
- if (r < 0) {
+ if (r < 0 && r != -EEXIST) {
log_error("Failed to make home directory: %s", strerror(-r));
return r;
}
--
1.8.5.2 (Apple Git-48)

View File

@ -110,6 +110,7 @@ src_prepare() {
# upstream fixes not yet in the release
epatch "${FILESDIR}"/211-tmpfiles.patch
epatch "${FILESDIR}"/211-0001-nspawn-allow-EEXIST-on-mkdir_safe-home-uid.patch
if [[ ${PV} == *9999 ]]; then
if use doc; then