From d3689161a2870a56ba5a2837daa2ca3463e24710 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 25 Aug 2010 03:11:26 +0200
Subject: mount: add global configuration options for handling of auto mounts

---
 src/swap.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/swap.c')

diff --git a/src/swap.c b/src/swap.c
index c81fd67cc8..4a672fbdff 100644
--- a/src/swap.c
+++ b/src/swap.c
@@ -195,7 +195,9 @@ 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_SYSTEM)) < 0)
+                if ((r = unit_add_node_link(u, s->what,
+                                            u->meta.manager->running_as == MANAGER_SYSTEM &&
+                                            u->meta.manager->swap_on_plug)) < 0)
                         return r;
 
                 if ((r = swap_add_mount_links(s)) < 0)
-- 
cgit v1.2.3-54-g00ecf