X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-action.c;h=cb64df086c815f45fa5bac4c2033d8f26153941c;hb=d2df0d0ed3a88e491405b403e6022e6619750130;hp=bd5664e90539bab48983fed5d8977690c3297da2;hpb=23406ce58aa7142e8df3c5c9e5ac34a01e90e3e0;p=elogind.git

diff --git a/src/login/logind-action.c b/src/login/logind-action.c
index bd5664e90..cb64df086 100644
--- a/src/login/logind-action.c
+++ b/src/login/logind-action.c
@@ -19,9 +19,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <unistd.h>
+
+#include "sd-messages.h"
 #include "conf-parser.h"
 #include "special.h"
-#include "dbus-common.h"
+#include "sleep-config.h"
+#include "bus-util.h"
+#include "bus-error.h"
 #include "logind-action.h"
 
 int manager_handle_action(
@@ -51,9 +56,10 @@ int manager_handle_action(
                 [HANDLE_HYBRID_SLEEP] = SPECIAL_HYBRID_SLEEP_TARGET
         };
 
-        DBusError error;
-        int r;
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
         InhibitWhat inhibit_operation;
+        bool supported;
+        int r;
 
         assert(m);
 
@@ -78,6 +84,27 @@ int manager_handle_action(
                 return 1;
         }
 
+        if (handle == HANDLE_SUSPEND)
+                supported = can_sleep("suspend") > 0;
+        else if (handle == HANDLE_HIBERNATE)
+                supported = can_sleep("hibernate") > 0;
+        else if (handle == HANDLE_HYBRID_SLEEP)
+                supported = can_sleep("hybrid-sleep") > 0;
+        else if (handle == HANDLE_KEXEC)
+                supported = access(KEXEC, X_OK) >= 0;
+        else
+                supported = true;
+
+        if (!supported) {
+                log_warning("Requested operation not supported, ignoring.");
+                return -ENOTSUP;
+        }
+
+        if (m->action_what) {
+                log_debug("Action already in progress, ignoring.");
+                return -EALREADY;
+        }
+
         inhibit_operation = handle == HANDLE_SUSPEND || handle == HANDLE_HIBERNATE || handle == HANDLE_HYBRID_SLEEP ? INHIBIT_SLEEP : INHIBIT_SHUTDOWN;
 
         /* If the actual operation is inhibited, warn and fail */
@@ -97,11 +124,9 @@ int manager_handle_action(
 
         log_info("%s", message_table[handle]);
 
-        dbus_error_init(&error);
         r = bus_manager_shutdown_or_sleep_now_or_later(m, target_table[handle], inhibit_operation, &error);
         if (r < 0) {
-                log_error("Failed to execute operation: %s", bus_error_message(&error));
-                dbus_error_free(&error);
+                log_error("Failed to execute operation: %s", bus_error_message(&error, r));
                 return r;
         }