]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Revert "core/execute: RuntimeDirectory= or friends requires mount namespace"
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 3 Jan 2018 15:16:53 +0000 (00:16 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 3 Jan 2018 15:26:11 +0000 (00:26 +0900)
This reverts commit 652bb2637aee54e3503a22d2928a929ecd7a84b3.

Fixes #7761.

src/core/execute.c

index 3f3d73272e6848c98e4ca45d8b56ef855c760da2..de72786d7fe89a145f139a0a4bc3819bbb99a0dc 100644 (file)
@@ -1789,12 +1789,7 @@ static bool exec_needs_mount_namespace(
             !strv_isempty(context->inaccessible_paths))
                 return true;
 
-        if (context->n_bind_mounts > 0 ||
-            !strv_isempty(context->directories[EXEC_DIRECTORY_RUNTIME].paths) ||
-            !strv_isempty(context->directories[EXEC_DIRECTORY_STATE].paths) ||
-            !strv_isempty(context->directories[EXEC_DIRECTORY_CACHE].paths) ||
-            !strv_isempty(context->directories[EXEC_DIRECTORY_LOGS].paths) ||
-            !strv_isempty(context->directories[EXEC_DIRECTORY_CONFIGURATION].paths))
+        if (context->n_bind_mounts > 0)
                 return true;
 
         if (context->mount_flags != 0)
@@ -1814,6 +1809,13 @@ static bool exec_needs_mount_namespace(
         if (context->mount_apivfs && (context->root_image || context->root_directory))
                 return true;
 
+        if (context->dynamic_user &&
+            (!strv_isempty(context->directories[EXEC_DIRECTORY_RUNTIME].paths) ||
+             !strv_isempty(context->directories[EXEC_DIRECTORY_STATE].paths) ||
+             !strv_isempty(context->directories[EXEC_DIRECTORY_CACHE].paths) ||
+             !strv_isempty(context->directories[EXEC_DIRECTORY_LOGS].paths)))
+                return true;
+
         return false;
 }