diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-04-11 08:51:06 +0200 |
---|---|---|
committer | Sven Eden <yamakuzure@gmx.net> | 2018-08-24 16:47:08 +0200 |
commit | adeb587a08c5f314cb74ccd31128e8dece59a945 (patch) | |
tree | 011e6c027a19abc0b341b271ea6733cb89ef8591 /src/login/logind-dbus.c | |
parent | 797ec1bf0caeea2b72de01f8082bba2d785a20e4 (diff) |
shared/sleep-config: return a custom message when not enough swap for hibernation
$ sudo swapoff -av
swapoff /dev/vda4
$ sudo systemctl hibernate
Failed to hibernate system via logind: Not enough swap space for hibernation
Fixes #6729.
Diffstat (limited to 'src/login/logind-dbus.c')
-rw-r--r-- | src/login/logind-dbus.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 73be87b19..6bc76464c 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -1907,14 +1907,17 @@ static int method_do_shutdown_or_sleep( if (sleep_verb) { #if 0 /// Within elogind the manager m must be provided, too r = can_sleep(sleep_verb); + if (r == -ENOSPC) + return sd_bus_error_set(error, BUS_ERROR_SLEEP_VERB_NOT_SUPPORTED, + "Not enough swap space for hibernation"); + if (r == 0) + return sd_bus_error_setf(error, BUS_ERROR_SLEEP_VERB_NOT_SUPPORTED, + "Sleep verb \"%s\" not supported", sleep_verb); #else r = can_sleep(m, sleep_verb); #endif // 0 if (r < 0) return r; - - if (r == 0) - return sd_bus_error_setf(error, BUS_ERROR_SLEEP_VERB_NOT_SUPPORTED, "Sleep verb not supported"); } #if 0 /// Within elogind it does not make sense to verify shutdown creds when suspending @@ -2401,13 +2404,13 @@ static int method_can_shutdown_or_sleep( if (sleep_verb) { #if 0 /// elogind needs to have the manager being passed r = can_sleep(sleep_verb); + if (IN_SET(r, 0, -ENOSPC)) + return sd_bus_reply_method_return(message, "s", "na"); #else r = can_sleep(m, sleep_verb); #endif // 0 if (r < 0) return r; - if (r == 0) - return sd_bus_reply_method_return(message, "s", "na"); } r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_EUID, &creds); |