manager: get rid of destinction between running_as=system and running_as=init, as...

[elogind.git] / src / swap.c

diff --git a/src/swap.c b/src/swap.c
index 5b3073bd4ae9b0204e79e076f48771cd97b6c499..501a1d96c8b70001f997209800b5feca54fb24a5 100644 (file)
--- a/src/swap.c
+++ b/src/swap.c
@@ -116,7 +116,7 @@ static int swap_add_target_links(Swap *s) {
         if ((r = manager_load_unit(s->meta.manager, SPECIAL_SWAP_TARGET, NULL, &tu)) < 0)
                 return r;
 
-        if (!p->noauto && p->handle && s->meta.manager->running_as != MANAGER_SESSION)
+        if (!p->noauto && p->handle && s->meta.manager->running_as == MANAGER_SYSTEM)
                 if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(s), true)) < 0)
                         return r;
 
@@ -180,9 +180,7 @@ static int swap_load(Unit *u) {
                         if ((r = unit_set_description(u, s->what)) < 0)
                                 return r;
 
-                if ((r = unit_add_node_link(u, s->what,
-                                            (u->meta.manager->running_as == MANAGER_INIT ||
-                                             u->meta.manager->running_as == MANAGER_SYSTEM))) < 0)
+                if ((r = unit_add_node_link(u, s->what, u->meta.manager->running_as == MANAGER_SYSTEM)) < 0)
                         return r;
 
                 if ((r = swap_add_mount_links(s)) < 0)