X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-action.c;h=74114ee0a126aede7f2dc48a137ba44b138d7fc8;hb=0fb0c56f5283a8a94560f595768a801c8240a9bd;hp=a796ebe9eca24ab2842f4c564eebac8d0dffd517;hpb=af9792ac7f39354f80e9006c42c2400c5e41c447;p=elogind.git

diff --git a/src/login/logind-action.c b/src/login/logind-action.c
index a796ebe9e..74114ee0a 100644
--- a/src/login/logind-action.c
+++ b/src/login/logind-action.c
@@ -21,10 +21,13 @@
 
 #include <unistd.h>
 
+#include <systemd/sd-messages.h>
+
 #include "conf-parser.h"
 #include "special.h"
 #include "dbus-common.h"
 #include "logind-action.h"
+#include "sleep-config.h"
 
 int manager_handle_action(
                 Manager *m,
@@ -60,7 +63,7 @@ int manager_handle_action(
 
         assert(m);
 
-        if (m->action_job || m->delayed_unit) {
+        if (m->action_what) {
                 log_debug("Action already in progress, ignoring.");
                 return -EALREADY;
         }
@@ -72,13 +75,13 @@ int manager_handle_action(
         }
 
         if (handle == HANDLE_SUSPEND)
-                supported = can_sleep("mem") > 0;
+                supported = can_sleep("suspend") > 0;
         else if (handle == HANDLE_HIBERNATE)
-                supported = can_sleep("disk") > 0;
+                supported = can_sleep("hibernate") > 0;
         else if (handle == HANDLE_HYBRID_SLEEP)
-                supported = can_sleep("disk") > 0 && can_sleep_disk("suspend") > 0;
+                supported = can_sleep("hybrid-sleep") > 0;
         else if (handle == HANDLE_KEXEC)
-                supported = access("/sbin/kexec", X_OK) >= 0;
+                supported = access(KEXEC, X_OK) >= 0;
         else
                 supported = true;