From: Thomas Bächler <thomas@archlinux.org>
Date: Fri, 5 Oct 2012 23:11:53 +0000 (+0200)
Subject: core/swap.c: Do not add Before=swap.target to swap units.
X-Git-Tag: v195~101
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=fd59a381e35edfbeb868143d76181be60df9c22b

core/swap.c: Do not add Before=swap.target to swap units.

The fstab generator adds Before=swap.target by default, and when creating
a custom .swap unit, you can also add Before=swap.target to the unit.

However, it is impossible to not have this ordering dependency right now.
Virtually all existing setups likely use the fstab generator, so this
change is unlikely to break anything.
---

diff --git a/src/core/swap.c b/src/core/swap.c
index b4f53b724..c708b7fef 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -165,22 +165,6 @@ static int swap_add_mount_links(Swap *s) {
         return 0;
 }
 
-static int swap_add_target_links(Swap *s) {
-        Unit *tu;
-        int r;
-
-        assert(s);
-
-        if (!s->from_fragment)
-                return 0;
-
-        r = manager_load_unit(UNIT(s)->manager, SPECIAL_SWAP_TARGET, NULL, NULL, &tu);
-        if (r < 0)
-                return r;
-
-        return unit_add_dependency(UNIT(s), UNIT_BEFORE, tu, true);
-}
-
 static int swap_add_device_links(Swap *s) {
         SwapParameters *p;
 
@@ -291,9 +275,6 @@ static int swap_load(Unit *u) {
                 if ((r = swap_add_mount_links(s)) < 0)
                         return r;
 
-                if ((r = swap_add_target_links(s)) < 0)
-                        return r;
-
                 if ((r = unit_add_default_cgroups(u)) < 0)
                         return r;