[systemd-commits] src/nspawn

[Lennart Poettering]

 src/nspawn/nspawn.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f418f31d5042398344740f2d8ac4dc1c2583151c
Author: Brandon Philips <brandon.philips at coreos.com>
Date:   Thu Mar 13 15:19:40 2014 -0700

    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.

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;
         }