chiark / gitweb /
Fix service file to match installed elogind binary location
[elogind.git] / src / sleep / sleep.c
index a2e8e603501a42f2da161537de3eb09fe336a91e..4b402abcd1cdcf880b152306798620ff1c48a326 100644 (file)
@@ -25,6 +25,7 @@
 #include "sd-messages.h"
 
 #include "def.h"
+#include "exec-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 //#include "log.h"
@@ -109,10 +110,10 @@ static int execute(char **modes, char **states) {
         if (r < 0)
                 return r;
 
-        execute_directories(dirs, DEFAULT_TIMEOUT_USEC, arguments);
+        execute_directories(dirs, DEFAULT_TIMEOUT_USEC, NULL, NULL, arguments);
 
         log_struct(LOG_INFO,
-                   LOG_MESSAGE_ID(SD_MESSAGE_SLEEP_START),
+                   "MESSAGE_ID=" SD_MESSAGE_SLEEP_START_STR,
                    LOG_MESSAGE("Suspending system..."),
                    "SLEEP=%s", arg_verb,
                    NULL);
@@ -122,13 +123,13 @@ static int execute(char **modes, char **states) {
                 return r;
 
         log_struct(LOG_INFO,
-                   LOG_MESSAGE_ID(SD_MESSAGE_SLEEP_STOP),
+                   "MESSAGE_ID=" SD_MESSAGE_SLEEP_STOP_STR,
                    LOG_MESSAGE("System resumed."),
                    "SLEEP=%s", arg_verb,
                    NULL);
 
         arguments[1] = (char*) "post";
-        execute_directories(dirs, DEFAULT_TIMEOUT_USEC, arguments);
+        execute_directories(dirs, DEFAULT_TIMEOUT_USEC, NULL, NULL, arguments);
 
         return r;
 }
@@ -220,9 +221,6 @@ finish:
 #else
 int do_sleep(const char *verb, char **modes, char **states) {
         assert(verb);
-        assert(modes);
-        assert(states);
-
         arg_verb = (char*)verb;
         return execute(modes, states);
 }