From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 22 May 2018 13:26:22 +0000 (+0900)
Subject: core: chown RuntimeDirectory= if DynamicUser= is set
X-Git-Tag: v239~216^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fdff1da299c4d3dbe9a62cb64fe9b4a3023877b8;p=thirdparty%2Fsystemd.git

core: chown RuntimeDirectory= if DynamicUser= is set

When DynamicUser= is set, then RuntimeDirectory= should be always
chowned, as the service unit may enable RuntimeDirectoryPreserve=,
and the uid or gid may changed from the last run.
This also makes easier to migrate the service to use DynamicUser=.
---

diff --git a/src/core/execute.c b/src/core/execute.c
index 9634ef98b10..8cb16eb49b4 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -2089,10 +2089,10 @@ static int setup_exec_directory(
                         }
                 } else {
                         r = mkdir_label(p, context->directories[type].mode);
-                        if (r == -EEXIST)
-                                continue;
-                        if (r < 0)
+                        if (r < 0 && r != -EEXIST)
                                 goto fail;
+                        if (r == -EEXIST && !context->dynamic_user)
+                                continue;
                 }
 
                 /* Don't change the owner of the configuration directory, as in the common case it is not written to by