projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4a78b63
)
core/swap: load() should fail when neither of corresponding unit file nor /proc/swap...
author
Yu Watanabe
<watanabe.yu+github@gmail.com>
Sun, 19 Nov 2017 16:00:34 +0000
(
01:00
+0900)
committer
Yu Watanabe
<watanabe.yu+github@gmail.com>
Mon, 20 Nov 2017 00:35:35 +0000
(09:35 +0900)
It is not necessary to label as loaded to a swap unit when neither of
corresponding unit file nor entry in /proc/swap does not exist.
This makes swap_load() to fail such a case.
Partially fixes #7370.
src/core/swap.c
patch
|
blob
|
history
diff --git
a/src/core/swap.c
b/src/core/swap.c
index
cfe9d91
..
f37a81f
100644
(file)
--- a/
src/core/swap.c
+++ b/
src/core/swap.c
@@
-292,7
+292,10
@@
static int swap_load(Unit *u) {
assert(u->load_state == UNIT_STUB);
/* Load a .swap file */
- r = unit_load_fragment_and_dropin_optional(u);
+ if (SWAP(u)->from_proc_swaps)
+ r = unit_load_fragment_and_dropin_optional(u);
+ else
+ r = unit_load_fragment_and_dropin(u);
if (r < 0)
return r;