diff options
Diffstat (limited to 'src/libsystemd/sd-path/sd-path.c')
| -rw-r--r-- | src/libsystemd/sd-path/sd-path.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c index cd76e3507c..419c763668 100644 --- a/src/libsystemd/sd-path/sd-path.c +++ b/src/libsystemd/sd-path/sd-path.c @@ -478,6 +478,12 @@ static int search_from_environment( return 0; } +#if HAVE_SPLIT_BIN +# define ARRAY_SBIN_BIN(x) x "sbin", x "bin" +#else +# define ARRAY_SBIN_BIN(x) x "bin" +#endif + static int get_search(uint64_t type, char ***list) { assert(list); @@ -490,13 +496,10 @@ static int get_search(uint64_t type, char ***list) { ".local/bin", "PATH", true, - "/usr/local/sbin", - "/usr/local/bin", - "/usr/sbin", - "/usr/bin", + ARRAY_SBIN_BIN("/usr/local/"), + ARRAY_SBIN_BIN("/usr/"), #if HAVE_SPLIT_USR - "/sbin", - "/bin", + ARRAY_SBIN_BIN("/"), #endif NULL); |