You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
27 lines
991 B
27 lines
991 B
2 years ago
|
From 56bc690688957abe24d434b7ede16cbe0f2d1233 Mon Sep 17 00:00:00 2001
|
||
|
|
From: David Tardon <dtardon@redhat.com>
|
||
|
|
Date: Tue, 17 Mar 2020 10:49:44 +0100
|
||
|
|
Subject: [PATCH] mount: don't add Requires for tmp.mount
|
||
|
|
|
||
|
|
This is a follow-up to #1619292.
|
||
|
|
|
||
|
|
rhel-only
|
||
|
|
Resolves: #1748840
|
||
|
|
---
|
||
|
|
src/core/mount.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/core/mount.c b/src/core/mount.c
|
||
|
|
index 30aaf5ae55..2746372db2 100644
|
||
|
|
--- a/src/core/mount.c
|
||
|
|
+++ b/src/core/mount.c
|
||
|
|
@@ -305,7 +305,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)
|