summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-02-07 15:56:28 +0100
committerLennart Poettering <lennart@poettering.net>2012-02-07 15:56:28 +0100
commit2c6db6fb9b1a10184b086df0d23228c4c0205a49 (patch)
treed1dc178ae74fb8c62652d9e4ef550ce3b6da9dc0 /src
parente9c06c79f2eba0f1ba39e95a5aaee79110513142 (diff)
main: use a shorter default $PATH if /usr is merged
Diffstat (limited to 'src')
-rw-r--r--src/main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main.c b/src/main.c
index 18cc74a2ea..a849824bb3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1292,7 +1292,11 @@ int main(int argc, char *argv[]) {
/* Set up PATH unless it is already set */
setenv("PATH",
+#ifdef HAVE_SPLIT_USR
"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+#else
+ "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin",
+#endif
arg_running_as == MANAGER_SYSTEM);
if (arg_running_as == MANAGER_SYSTEM) {