From: Tom Gundersen <teg@jklm.no>
Date: Wed, 21 Aug 2013 14:47:26 +0000 (+0800)
Subject: swap: backing device should unconditionally want swap unit
X-Git-Tag: v207~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b56a422a919ec5a12f8fa7f9dfc63f7d88c6a077;p=thirdparty%2Fsystemd.git

swap: backing device should unconditionally want swap unit

There is no need to restrict this to only the 'nofail' case. In the '!nofail'
case the unit is already wanted by swap.target, so this is not a functional change.
---

diff --git a/src/core/swap.c b/src/core/swap.c
index 825503f3dea..f0e19ad8c42 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -187,8 +187,7 @@ static int swap_add_device_links(Swap *s) {
                 return 0;
 
         if (is_device_path(s->what))
-                return unit_add_node_link(UNIT(s), s->what,
-                                          !p->noauto && p->nofail &&
+                return unit_add_node_link(UNIT(s), s->what, !p->noauto &&
                                           UNIT(s)->manager->running_as == SYSTEMD_SYSTEM);
         else
                 /* File based swap devices need to be ordered after