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:
44ed821
)
Prep v231.2: Send processes the wakeup signal, even if suspending the system failed.
author
Sven Eden
<yamakuzure@gmx.net>
Tue, 27 Jun 2017 06:05:27 +0000
(08:05 +0200)
committer
Sven Eden
<yamakuzure@gmx.net>
Tue, 27 Jun 2017 06:05:27 +0000
(08:05 +0200)
src/login/logind-dbus.c
patch
|
blob
|
history
diff --git
a/src/login/logind-dbus.c
b/src/login/logind-dbus.c
index 1ab874537506b5174571ba19a9f5f06d32a01ba8..7313f4329e923feef205c9e1377823cfd3003a79 100644
(file)
--- a/
src/login/logind-dbus.c
+++ b/
src/login/logind-dbus.c
@@
-1627,8
+1627,6
@@
static int execute_shutdown_or_sleep(
/* no more pending actions, whether this failed or not */
m->pending_action = HANDLE_IGNORE;
- if (r < 0)
- return r;
/* As elogind can not rely on a systemd manager to call all
* sleeping processes to wake up, we have to tell them all
@@
-1638,6
+1636,9
@@
static int execute_shutdown_or_sleep(
m->action_what = 0;
} else
m->action_what = w;
+
+ if (r < 0)
+ return r;
#endif // 0
/* Make sure the lid switch is ignored for a while */