From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 21 Jan 2020 17:16:53 +0000 (+0100)
Subject: core: downgrade swap → device dep to Requires=
X-Git-Tag: v245-rc1~16^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e3e6f996894f0eea0e766b4194922f5c7235fb01;p=thirdparty%2Fsystemd.git

core: downgrade swap → device dep to Requires=

This catches up with 9d06297e262966de71095debd1537fc223f940a3 and adapts
the change made to swap units. We generally don't want to react
a-posteriori to swap devices disappearing, bad things will happen
anyway.
---

diff --git a/src/core/swap.c b/src/core/swap.c
index 4155112f412..713d7856185 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -212,7 +212,7 @@ static int swap_add_device_dependencies(Swap *s) {
         mask = s->from_proc_swaps ? UNIT_DEPENDENCY_PROC_SWAP : UNIT_DEPENDENCY_FILE;
 
         if (is_device_path(p->what))
-                return unit_add_node_dependency(UNIT(s), p->what, UNIT_BINDS_TO, mask);
+                return unit_add_node_dependency(UNIT(s), p->what, UNIT_REQUIRES, mask);
 
         /* File based swap devices need to be ordered after systemd-remount-fs.service, since they might need
          * a writable file system. */