summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Landden <shawn@churchofgit.com>2013-12-20 15:35:38 -0800
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-12-20 23:14:21 -0500
commite10a55fd72b5246cec1bbd09135d544db32e0414 (patch)
treecd33a4a8289ade63223acee62435d6b0f2e2cd7c
parent4d89874af6a798744a32deb314001a13a28f0559 (diff)
DEFAULT_PATH_SPLIT_USR macro
-rw-r--r--src/nspawn/nspawn.c2
-rw-r--r--src/shared/path-util.h7
2 files changed, 6 insertions, 3 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index a85579b940..241b4b5393 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1243,7 +1243,7 @@ int main(int argc, char *argv[]) {
gid_t gid = (gid_t) -1;
unsigned n_env = 2;
const char *envp[] = {
- "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+ "PATH=" DEFAULT_PATH_SPLIT_USR,
"container=systemd-nspawn", /* LXC sets container=lxc, so follow the scheme here */
NULL, /* TERM */
NULL, /* HOME */
diff --git a/src/shared/path-util.h b/src/shared/path-util.h
index 1098f6540c..4b74fe077e 100644
--- a/src/shared/path-util.h
+++ b/src/shared/path-util.h
@@ -26,10 +26,13 @@
#include "macro.h"
#include "time-util.h"
+#define DEFAULT_PATH_NORMAL "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin"
+#define DEFAULT_PATH_SPLIT_USR DEFAULT_PATH_NORMAL ":/sbin:/bin"
+
#ifdef HAVE_SPLIT_USR
-# define DEFAULT_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+# define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR
#else
-# define DEFAULT_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin"
+# define DEFAULT_PATH DEFAULT_PATH_NORMAL
#endif
bool is_path(const char *p) _pure_;