chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
execute: fix parsing of StandardError= setting
[elogind.git]
/
src
/
swap.c
diff --git
a/src/swap.c
b/src/swap.c
index bd49e1ea2bd36e5743d9e30ad58605f52b389abc..c35a8e785a6708099c1eb9f8974a60dd06438d26 100644
(file)
--- a/
src/swap.c
+++ b/
src/swap.c
@@
-115,7
+115,7
@@
static int swap_add_target_links(Swap *s) {
if ((r = manager_load_unit(s->meta.manager, SPECIAL_SWAP_TARGET, NULL, &tu)) < 0)
return r;
if ((r = manager_load_unit(s->meta.manager, SPECIAL_SWAP_TARGET, NULL, &tu)) < 0)
return r;
- if (!p->noauto && p->handle)
+ if (!p->noauto && p->handle
&& s->meta.manager->running_as != MANAGER_SESSION
)
if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(s), true)) < 0)
return r;
if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(s), true)) < 0)
return r;
@@
-246,7
+246,7
@@
int swap_add_one(
bool from_proc_swaps) {
Unit *u = NULL;
char *e = NULL, *w = NULL;
bool from_proc_swaps) {
Unit *u = NULL;
char *e = NULL, *w = NULL;
- bool delete;
+ bool delete
= false
;
int r;
SwapParameters *p;
int r;
SwapParameters *p;