SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove /sbin from paths if split-bin is false (#8324)

Browse Source 
Follow-up for 157baa87e4.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2018-03-01 21:48:36 +01:00
committed by Lennart Poettering
parent 7df4b832d0
commit 671f0f8de0
4 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/path-util.h
+8 -2
View File
@@ -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