From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 21 Feb 2017 10:11:44 +0000 (+0100)
Subject: Merge pull request #5131 from keszybz/environment-generators
X-Git-Tag: v233~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4dde27d73c1d8219c0cc6390ef8b6e15b347edb;p=thirdparty%2Fsystemd.git

Merge pull request #5131 from keszybz/environment-generators

Environment generators
---

a4dde27d73c1d8219c0cc6390ef8b6e15b347edb
diff --cc src/sleep/sleep.c
index ea966152225,a6978b62730..3bac78b3e4c
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@@ -106,10 -107,10 +107,10 @@@ static int execute(char **modes, char *
          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);