From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 22 Aug 2019 16:04:24 +0000 (+0900)
Subject: core: also remove private directories by systemctl clean
X-Git-Tag: v243~10^2~2
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fsystemd.git;a=commitdiff_plain;h=7f622a19d94210c73c2c13857f0f361b87876893

core: also remove private directories by systemctl clean

Fixes #13355.
---

diff --git a/src/core/execute.c b/src/core/execute.c
index eb761f0b211..5b9b2ed2ec1 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -4822,6 +4822,17 @@ int exec_context_get_clean_directories(
                         r = strv_consume(&l, j);
                         if (r < 0)
                                 return r;
+
+                        /* Also remove private directories unconditionally. */
+                        if (t != EXEC_DIRECTORY_CONFIGURATION) {
+                                j = path_join(prefix[t], "private", *i);
+                                if (!j)
+                                        return -ENOMEM;
+
+                                r = strv_consume(&l, j);
+                                if (r < 0)
+                                        return r;
+                        }
                 }
         }