summaryrefslogtreecommitdiff
path: root/src/basic/path-util.h
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-04-20 11:36:25 +0200
committerSven Eden <yamakuzure@gmx.net>2018-08-24 16:47:08 +0200
commit2d4bef91fa5f502b6f466648a1dcd4644662875d (patch)
tree5a4b29186a8beb7ba76b5e4626909ffef3db0944 /src/basic/path-util.h
parent15f9c17dd3ccf9dc21ceb795feb27a6b6dee1b1f (diff)
nspawn: when running nspawn, set a $PATH including both bin + sbin by default (#8756)
We don't know what the container payload needs, hence default to a PATH with both bin and sbin included, as well as / and /usr. Follow-up for #8324 Fixes: #8698
Diffstat (limited to 'src/basic/path-util.h')
-rw-r--r--src/basic/path-util.h15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/basic/path-util.h b/src/basic/path-util.h
index 6583c2c9b..9f22322ab 100644
--- a/src/basic/path-util.h
+++ b/src/basic/path-util.h
@@ -15,18 +15,25 @@
#include "string-util.h"
#include "time-util.h"
+#define PATH_SPLIT_SBIN_BIN(x) x "sbin:" x "bin"
+#define PATH_SPLIT_SBIN_BIN_NULSTR(x) x "sbin\0" x "bin\0"
+
+#define PATH_NORMAL_SBIN_BIN(x) x "bin"
+#define PATH_NORMAL_SBIN_BIN_NULSTR(x) x "bin\0"
+
#if HAVE_SPLIT_BIN
-# define PATH_SBIN_BIN(x) x "sbin:" x "bin"
-# define PATH_SBIN_BIN_NULSTR(x) x "sbin\0" x "bin\0"
+# define PATH_SBIN_BIN(x) PATH_SPLIT_SBIN_BIN(x)
+# define PATH_SBIN_BIN_NULSTR(x) PATH_SPLIT_SBIN_BIN_NULSTR(x)
#else
-# define PATH_SBIN_BIN(x) x "bin"
-# define PATH_SBIN_BIN_NULSTR(x) x "bin\0"
+# define PATH_SBIN_BIN(x) PATH_NORMAL_SBIN_BIN(x)
+# define PATH_SBIN_BIN_NULSTR(x) PATH_NORMAL_SBIN_BIN_NULSTR(x)
#endif
#define DEFAULT_PATH_NORMAL PATH_SBIN_BIN("/usr/local/") ":" PATH_SBIN_BIN("/usr/")
#define DEFAULT_PATH_NORMAL_NULSTR PATH_SBIN_BIN_NULSTR("/usr/local/") PATH_SBIN_BIN_NULSTR("/usr/")
#define DEFAULT_PATH_SPLIT_USR DEFAULT_PATH_NORMAL ":" PATH_SBIN_BIN("/")
#define DEFAULT_PATH_SPLIT_USR_NULSTR DEFAULT_PATH_NORMAL_NULSTR PATH_SBIN_BIN_NULSTR("/")
+#define DEFAULT_PATH_COMPAT PATH_SPLIT_SBIN_BIN("/usr/local/") ":" PATH_SPLIT_SBIN_BIN("/usr/") ":" PATH_SPLIT_SBIN_BIN("/")
#if HAVE_SPLIT_USR
# define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR