chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f959c5e
)
swap: handle "nofail" from fstab
author
Kay Sievers
<kay.sievers@vrfy.org>
Tue, 15 Feb 2011 17:38:15 +0000
(18:38 +0100)
committer
Kay Sievers
<kay.sievers@vrfy.org>
Tue, 15 Feb 2011 17:38:15 +0000
(18:38 +0100)
src/swap.c
patch
|
blob
|
history
diff --git
a/src/swap.c
b/src/swap.c
index db0614b9f9a488d8ba2620d638c724a7ef685074..4ffe19f1e84a3052f60d48e3ba3d38388264925e 100644
(file)
--- a/
src/swap.c
+++ b/
src/swap.c
@@
-177,6
+177,7
@@
static int swap_add_target_links(Swap *s) {
return r;
if (!p->noauto &&
return r;
if (!p->noauto &&
+ !p->nofail &&
(p->handle || s->meta.manager->swap_auto) &&
s->from_etc_fstab &&
s->meta.manager->running_as == MANAGER_SYSTEM)
(p->handle || s->meta.manager->swap_auto) &&
s->from_etc_fstab &&
s->meta.manager->running_as == MANAGER_SYSTEM)