diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-03-01 21:48:36 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-03-01 21:48:36 +0100 |
| commit | 671f0f8de0a623cb3e4f66b562eae332135c8ca2 (patch) | |
| tree | 0df93b88fcf208814799b1f88c575e4966441eb8 /src/basic/path-util.h | |
| parent | 7df4b832d0b07310f7f0a0c1eacf9694faf3a518 (diff) | |
| download | systemd-671f0f8de0a623cb3e4f66b562eae332135c8ca2.tar.gz | |
Remove /sbin from paths if split-bin is false (#8324)
Follow-up for 157baa87e4.
Diffstat (limited to 'src/basic/path-util.h')
| -rw-r--r-- | src/basic/path-util.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/basic/path-util.h b/src/basic/path-util.h index 89c285e076..73f1769fd9 100644 --- a/src/basic/path-util.h +++ b/src/basic/path-util.h @@ -28,8 +28,14 @@ #include "string-util.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" +#if HAVE_SPLIT_BIN +# define PATH_SBIN_BIN(x) x "sbin:" x "bin" +#else +# define PATH_SBIN_BIN(x) x "bin" +#endif + +#define DEFAULT_PATH_NORMAL PATH_SBIN_BIN("/usr/local/") ":" PATH_SBIN_BIN("/usr/") +#define DEFAULT_PATH_SPLIT_USR DEFAULT_PATH_NORMAL ":" PATH_SBIN_BIN("/") #if HAVE_SPLIT_USR # define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR |