From 81bf310edce1fccb2720b48fcc5f4bdbd187cd55 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 25 Aug 2010 21:24:21 +0200
Subject: mount: imply noauto for mount points configured with native mount
 files

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

(limited to 'src/swap.c')

diff --git a/src/swap.c b/src/swap.c
index 69ccd3db6c..0beb9212ea 100644
--- a/src/swap.c
+++ b/src/swap.c
@@ -113,7 +113,10 @@ static int swap_add_target_links(Swap *s) {
         if ((r = manager_load_unit(s->meta.manager, SPECIAL_SWAP_TARGET, NULL, NULL, &tu)) < 0)
                 return r;
 
-        if (!p->noauto && (p->handle || s->meta.manager->swap_auto) && s->meta.manager->running_as == MANAGER_SYSTEM)
+        if (!p->noauto &&
+            (p->handle || s->meta.manager->swap_auto) &&
+            !s->from_fragment &&
+            s->meta.manager->running_as == MANAGER_SYSTEM)
                 if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(s), true)) < 0)
                         return r;
 
-- 
cgit v1.2.3-54-g00ecf