Merge pull request #5131 from keszybz/environment-generators

Environment generators

diff --cc .gitignore
Simple merge

diff --cc Makefile-man.am
Simple merge

diff --cc Makefile.am
Simple merge

diff --cc configure.ac
Simple merge

diff --cc src/core/manager.c
Simple merge

diff --cc src/shared/path-lookup.c
Simple merge

diff --cc src/sleep/sleep.c
index ea966152225c6284044bccc1d5f14a03d5b83412,a6978b62730d7182f79b0e4d8d15ce4c0a9f765f..3bac78b3e4cc84529bb1637175bbda3df51dda92
--- 1/src/sleep/sleep.c
--- 2/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);