core: automatically add dependency on systemd-remount-fs.service if StateDirectory...

And similar for other settings that require a writable /var/.

Rationale: if these options are used for early-boot services (such as
systemd-pstore.service) we need /var/ writable. And if /var/ is on the
root fs, then systemd-remount-fs.service is the service that ensures
that /var/ is writable.

This allows us to remove explicit deps in services such as
systemd-pstore.service.

(cherry picked from commit f3b7a79b973a28af4f7a592a8b2e199cc194218b)

Gbp-Pq: Name core-automatically-add-dependency-on-systemd-remount-fs.s.patch

diff --git a/src/core/unit.c b/src/core/unit.c
index 87585808a80c70fd795b399231a29ce54ec53307..0e0166ef896a6bb2effb15ad0b23a29b0669c2fb 100644 (file)
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1046,6 +1046,16 @@ int unit_add_exec_dependencies(Unit *u, ExecContext *c) {
         if (!MANAGER_IS_SYSTEM(u->manager))
                 return 0;
 
+        /* For the following three directory types we need write access, and /var/ is possibly on the root
+         * fs. Hence order after systemd-remount-fs.service, to ensure things are writable. */
+        if (!strv_isempty(c->directories[EXEC_DIRECTORY_STATE].paths) ||
+            !strv_isempty(c->directories[EXEC_DIRECTORY_CACHE].paths) ||
+            !strv_isempty(c->directories[EXEC_DIRECTORY_LOGS].paths)) {
+                r = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_REMOUNT_FS_SERVICE, true, UNIT_DEPENDENCY_FILE);
+                if (r < 0)
+                        return r;
+        }
+
         if (c->private_tmp) {
                 const char *p;