summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2012-05-31 20:07:12 -0400
committerLennart Poettering <lennart@poettering.net>2012-06-01 15:58:21 +0200
commitddcbc8737873ca1904562d7d3ca3de9946e2f889 (patch)
treeac4dd62234bb6da9189425bf7a2714225bfda4a6
parent871206d340ed6119b31daeb8b13c8ef5ccf25501 (diff)
sleep: Don't call execute_directory() on a binary
Probably a copy-paste error, SYSTEMD_SLEEP_BINARY_PATH should have been SYSTEMD_SLEEP_PATH.
-rw-r--r--Makefile.am1
-rw-r--r--src/sleep/sleep.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 833f72ac5d..15f7a3485d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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"\" \
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index 941edc303d..c86f69c4aa 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -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);