chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: don't do more reloads than necessary in spec files
[elogind.git]
/
src
/
swap.c
diff --git
a/src/swap.c
b/src/swap.c
index 4124f7585226b9771348e521412b22d34e24671c..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)
@@
-264,6
+265,8
@@
static int swap_load(Unit *u) {
return r;
if (u->meta.load_state == UNIT_LOADED) {
return r;
if (u->meta.load_state == UNIT_LOADED) {
+ if ((r = unit_add_exec_dependencies(u, &s->exec_context)) < 0)
+ return r;
if (s->meta.fragment_path)
s->from_fragment = true;
if (s->meta.fragment_path)
s->from_fragment = true;