unit: don't add Requires for tmp.mount

rhel-only
Resolves: #1619292

(cherry picked from commit 03e52d33bbdea731eaa79545bb1d30c5b21abe3d)

diff --git a/src/core/mount.c b/src/core/mount.c
index 053deac14dbfafb835ebefa29dad6f47de3c1e1a..1fd3102ad3d6b70ce1b82e6f88232d57d62286fc 100644 (file)
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -343,7 +343,7 @@ static int mount_add_mount_dependencies(Mount *m) {
                 if (r < 0)
                         return r;
 
-                if (UNIT(m)->fragment_path) {
+                if (UNIT(m)->fragment_path && !streq(UNIT(m)->id, "tmp.mount")) {
                         /* If we have fragment configuration, then make this dependency required */
                         r = unit_add_dependency(other, UNIT_REQUIRES, UNIT(m), true, UNIT_DEPENDENCY_PATH);
                         if (r < 0)

diff --git a/src/core/unit.c b/src/core/unit.c
index d9cd0c229aa333ea6e2a56f8212d3904322a04db..371dda7e29b9501e5007cc50d93d708b219115bf 100644 (file)
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1506,7 +1506,7 @@ static int unit_add_mount_dependencies(Unit *u) {
                         if (r < 0)
                                 return r;
 
-                        if (m->fragment_path) {
+                        if (m->fragment_path && !streq(m->id, "tmp.mount")) {
                                 r = unit_add_dependency(u, UNIT_REQUIRES, m, true, di.origin_mask);
                                 if (r < 0)
                                         return r;