From a39b4bdd10fc15654db37459fe8235a3de1ad817 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Tue, 30 Dec 2014 18:38:21 -0500 Subject: systemctl: do not repeat hibernate/sleep attempts If some sleep operation was not possible (e.g. because swap is missing), we would try twice: once through logind, which would result in a clean error: Failed to execute operation: Sleep verb not supported and then second time by starting the appropriate unit directly, which is more messy. If logind tells us that something is not possible (or already in progress), report that to the user and quit. If logind is present and working we should not try to work around it. Loosely based on https://bugs.freedesktop.org/show_bug.cgi?id=87832. --- src/systemctl/systemctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index a6c7e91f54..9c4b9ed277 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -2966,7 +2966,7 @@ static int start_special(sd_bus *bus, char **args) { a == ACTION_HIBERNATE || a == ACTION_HYBRID_SLEEP)) { r = reboot_with_logind(bus, a); - if (r >= 0) + if (r >= 0 || IN_SET(r, -ENOTSUP, -EINPROGRESS)) return r; } -- cgit v1.2.3-54-g00ecf