Make tmpdir removal asynchronous

[elogind.git] / src / core / manager.c

diff --git a/src/core/manager.c b/src/core/manager.c
index 10ccffb4044ded10e616a12ad5049a7faac58b2c..079db4157babc7d215217370df13e5f2ef35510f 100644 (file)
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -456,12 +456,6 @@ static int manager_setup_signals(Manager *m) {
 }
 
 static int manager_default_environment(Manager *m) {
-#ifdef HAVE_SPLIT_USR
-        const char *path = "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin";
-#else
-        const char *path = "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin";
-#endif
-
         assert(m);
 
         if (m->running_as == SYSTEMD_SYSTEM) {
@@ -472,7 +466,8 @@ static int manager_default_environment(Manager *m) {
                  * The initial passed environ is untouched to keep
                  * /proc/self/environ valid; it is used for tagging
                  * the init process inside containers. */
-                m->environment = strv_new(path, NULL);
+                m->environment = strv_new("PATH=" DEFAULT_PATH,
+                                          NULL);
 
                 /* Import locale variables LC_*= from configuration */
                 locale_setup(&m->environment);