diff options
| author | Tom Gundersen <teg@jklm.no> | 2013-08-21 22:47:26 +0800 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2013-09-11 14:40:59 +0200 |
| commit | b56a422a919ec5a12f8fa7f9dfc63f7d88c6a077 (patch) | |
| tree | 9106a97f5e01e610c0039921c5753a9bcfcfec89 /src/core | |
| parent | 80c3b720bf3abbcc9427507d540e286c4ceb3e94 (diff) | |
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.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/swap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/swap.c b/src/core/swap.c index 825503f3de..f0e19ad8c4 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 |