X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fswap.c;h=ddda9e1a3104d5b6143c9b89aabaf2bb72c5fa71;hp=abd8cdd8d68f892e2d0b87c03adcf1430f1f0c7e;hb=ead8e4788ee31bbdc38b4cd3c6e71c8a95bbc95a;hpb=f1a1cd6497a970a8744b6d71cf5355fa9f75669c

diff --git a/src/swap.c b/src/swap.c
index abd8cdd8d..ddda9e1a3 100644
--- a/src/swap.c
+++ b/src/swap.c
@@ -176,7 +176,7 @@ static int swap_add_target_links(Swap *s) {
 
         if (!p->noauto &&
             (p->handle || s->meta.manager->swap_auto) &&
-            !s->from_fragment &&
+            s->from_etc_fstab &&
             s->meta.manager->running_as == MANAGER_SYSTEM)
                 if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(s), true)) < 0)
                         return r;
@@ -211,10 +211,7 @@ static int swap_add_default_dependencies(Swap *s) {
 
         if (s->meta.manager->running_as == MANAGER_SYSTEM) {
 
-                if ((r = unit_add_dependency_by_name(UNIT(s), UNIT_AFTER, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0)
-                        return r;
-
-                if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
+                if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
                         return r;
         }