|
 |
2aacef |
From c5f1cc8f23dfe545c0d03eae88bbd91e8a1db226 Mon Sep 17 00:00:00 2001
|
|
|
aa0848 |
From: Lukas Nykryn <lnykryn@redhat.com>
|
|
|
aa0848 |
Date: Mon, 5 Sep 2016 12:47:09 +0200
|
|
|
aa0848 |
Subject: [PATCH] unit: don't add Requires for tmp.mount
|
|
|
aa0848 |
|
|
|
aa0848 |
rhel-only
|
|
|
2aacef |
Related: #2138081
|
|
|
aa0848 |
---
|
|
|
aa0848 |
src/core/mount.c | 2 +-
|
|
|
aa0848 |
src/core/unit.c | 2 +-
|
|
|
aa0848 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
aa0848 |
|
|
|
aa0848 |
diff --git a/src/core/mount.c b/src/core/mount.c
|
|
|
2aacef |
index 5e8a6ead61..ba55f7dd86 100644
|
|
|
aa0848 |
--- a/src/core/mount.c
|
|
|
aa0848 |
+++ b/src/core/mount.c
|
|
|
2aacef |
@@ -336,7 +336,7 @@ static int mount_add_mount_dependencies(Mount *m) {
|
|
|
aa0848 |
if (r < 0)
|
|
|
aa0848 |
return r;
|
|
|
aa0848 |
|
|
|
aa0848 |
- if (UNIT(m)->fragment_path) {
|
|
|
aa0848 |
+ if (UNIT(m)->fragment_path && !streq(UNIT(m)->id, "tmp.mount")) {
|
|
|
aa0848 |
/* If we have fragment configuration, then make this dependency required */
|
|
|
aa0848 |
r = unit_add_dependency(other, UNIT_REQUIRES, UNIT(m), true, UNIT_DEPENDENCY_PATH);
|
|
|
aa0848 |
if (r < 0)
|
|
|
aa0848 |
diff --git a/src/core/unit.c b/src/core/unit.c
|
|
|
2aacef |
index 1fad0b0ac8..5af44aaf4a 100644
|
|
|
aa0848 |
--- a/src/core/unit.c
|
|
|
aa0848 |
+++ b/src/core/unit.c
|
|
|
2aacef |
@@ -1541,7 +1541,7 @@ static int unit_add_mount_dependencies(Unit *u) {
|
|
|
aa0848 |
return r;
|
|
|
2aacef |
changed = changed || r > 0;
|
|
|
aa0848 |
|
|
|
aa0848 |
- if (m->fragment_path) {
|
|
|
aa0848 |
+ if (m->fragment_path && !streq(m->id, "tmp.mount")) {
|
|
|
aa0848 |
r = unit_add_dependency(u, UNIT_REQUIRES, m, true, di.origin_mask);
|
|
|
aa0848 |
if (r < 0)
|
|
|
aa0848 |
return r;
|