chiark / gitweb /
sleep: Don't call execute_directory() on a binary
authorMatthias Clasen <mclasen@redhat.com>
Fri, 1 Jun 2012 00:07:12 +0000 (20:07 -0400)
committerLennart Poettering <lennart@poettering.net>
Fri, 1 Jun 2012 13:58:21 +0000 (15:58 +0200)
Probably a copy-paste error, SYSTEMD_SLEEP_BINARY_PATH should
have been SYSTEMD_SLEEP_PATH.

Makefile.am
src/sleep/sleep.c

index 833f72a..15f7a34 100644 (file)
@@ -129,6 +129,7 @@ AM_CPPFLAGS = \
        -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
        -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
        -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
+       -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
        -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
        -DX_SERVER=\"$(bindir)/X\" \
        -DUDEVLIBEXECDIR=\""$(libexecdir)/udev"\" \
index 941edc3..c86f69c 100644 (file)
@@ -63,7 +63,7 @@ int main(int argc, char *argv[]) {
         arguments[1] = (char*) "pre";
         arguments[2] = argv[1];
         arguments[3] = NULL;
-        execute_directory(SYSTEMD_SLEEP_BINARY_PATH, NULL, arguments);
+        execute_directory(SYSTEM_SLEEP_PATH, NULL, arguments);
 
         if (streq(argv[1], "suspend"))
                 log_info("Suspending system...");
@@ -82,7 +82,7 @@ int main(int argc, char *argv[]) {
                 log_info("System thawed.");
 
         arguments[1] = (char*) "post";
-        execute_directory(SYSTEMD_SLEEP_BINARY_PATH, NULL, arguments);
+        execute_directory(SYSTEM_SLEEP_PATH, NULL, arguments);
 
         fclose(f);