getty@.service: switch to agetty as the default

[elogind.git] / src / swap.c

diff --git a/src/swap.c b/src/swap.c
index f7f9530a03963daf34df4c5cb1bcdb4f1e012335..078ad9fbbffc470469e42282ae7aabd532467ac6 100644 (file)
--- 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,9 +211,6 @@ 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)
                         return r;
         }
@@ -283,7 +280,6 @@ static int swap_load(Unit *u) {
                         if ((r = unit_set_description(u, s->what)) < 0)
                                 return r;
 
-
                 if ((r = swap_add_device_links(s)) < 0)
                         return r;
 
@@ -293,6 +289,9 @@ static int swap_load(Unit *u) {
                 if ((r = swap_add_target_links(s)) < 0)
                         return r;
 
+                if ((r = unit_add_default_cgroup(u)) < 0)
+                        return r;
+
                 if (s->meta.default_dependencies)
                         if ((r = swap_add_default_dependencies(s)) < 0)
                                 return r;