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

diff --git a/src/swap.c b/src/swap.c
index bd49e1ea2..c35a8e785 100644
--- a/src/swap.c
+++ b/src/swap.c
@@ -115,7 +115,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)
+        if (!p->noauto && p->handle && s->meta.manager->running_as != MANAGER_SESSION)
                 if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(s), true)) < 0)
                         return r;
 
@@ -246,7 +246,7 @@ int swap_add_one(
                 bool from_proc_swaps) {
         Unit *u = NULL;
         char *e = NULL, *w = NULL;
-        bool delete;
+        bool delete = false;
         int r;
         SwapParameters *p;