|
 |
a52f674 |
From 52410883d28cb05012ddbc892bc73071bdd2145b Mon Sep 17 00:00:00 2001
|
|
|
b12ff75 |
From: Shawn Landden <shawn@churchofgit.com>
|
|
|
b12ff75 |
Date: Fri, 20 Dec 2013 15:35:38 -0800
|
|
|
b12ff75 |
Subject: [PATCH] DEFAULT_PATH_SPLIT_USR macro
|
|
|
b12ff75 |
|
|
|
a52f674 |
(cherry picked from commit e10a55fd72b5246cec1bbd09135d544db32e0414)
|
|
|
b12ff75 |
---
|
|
|
b12ff75 |
src/nspawn/nspawn.c | 2 +-
|
|
|
b12ff75 |
src/shared/path-util.h | 7 +++++--
|
|
|
b12ff75 |
2 files changed, 6 insertions(+), 3 deletions(-)
|
|
|
b12ff75 |
|
|
|
b12ff75 |
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
|
|
|
1cc3df3 |
index 618f9c3dc7..cafc306273 100644
|
|
|
b12ff75 |
--- a/src/nspawn/nspawn.c
|
|
|
b12ff75 |
+++ b/src/nspawn/nspawn.c
|
|
|
b12ff75 |
@@ -1227,7 +1227,7 @@ int main(int argc, char *argv[]) {
|
|
|
b12ff75 |
gid_t gid = (gid_t) -1;
|
|
|
b12ff75 |
unsigned n_env = 2;
|
|
|
b12ff75 |
const char *envp[] = {
|
|
|
b12ff75 |
- "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
|
|
|
b12ff75 |
+ "PATH=" DEFAULT_PATH_SPLIT_USR,
|
|
|
b12ff75 |
"container=systemd-nspawn", /* LXC sets container=lxc, so follow the scheme here */
|
|
|
b12ff75 |
NULL, /* TERM */
|
|
|
b12ff75 |
NULL, /* HOME */
|
|
|
b12ff75 |
diff --git a/src/shared/path-util.h b/src/shared/path-util.h
|
|
|
1cc3df3 |
index 0a42de7e27..1e58e1b813 100644
|
|
|
b12ff75 |
--- a/src/shared/path-util.h
|
|
|
b12ff75 |
+++ b/src/shared/path-util.h
|
|
|
b12ff75 |
@@ -25,10 +25,13 @@
|
|
|
b12ff75 |
|
|
|
b12ff75 |
#include "macro.h"
|
|
|
b12ff75 |
|
|
|
b12ff75 |
+#define DEFAULT_PATH_NORMAL "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin"
|
|
|
b12ff75 |
+#define DEFAULT_PATH_SPLIT_USR DEFAULT_PATH_NORMAL ":/sbin:/bin"
|
|
|
b12ff75 |
+
|
|
|
b12ff75 |
#ifdef HAVE_SPLIT_USR
|
|
|
b12ff75 |
-# define DEFAULT_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
|
|
|
b12ff75 |
+# define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR
|
|
|
b12ff75 |
#else
|
|
|
b12ff75 |
-# define DEFAULT_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin"
|
|
|
b12ff75 |
+# define DEFAULT_PATH DEFAULT_PATH_NORMAL
|
|
|
b12ff75 |
#endif
|
|
|
b12ff75 |
|
|
|
b12ff75 |
bool is_path(const char *p) _pure_;
|