forked from mirrors/nixpkgs
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
|
From 0939ac4be7ced099670979f26adf8a579173ce4b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Florian Klink <flokli@flokli.de>
|
||
|
|
Date: Sun, 8 Mar 2020 01:05:54 +0100
|
||
|
|
Subject: [PATCH] path-util.h: add placeholder for DEFAULT_PATH_NORMAL
|
||
|
|
|
||
|
|
This will be the $PATH used to lookup ExecStart= etc. options, which
|
||
|
|
systemd itself uses extensively.
|
||
|
|
---
|
||
|
|
src/basic/path-util.h | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/basic/path-util.h b/src/basic/path-util.h
|
||
|
|
index 111d85d445..cfd92aeb73 100644
|
||
|
|
--- a/src/basic/path-util.h
|
||
|
|
+++ b/src/basic/path-util.h
|
||
|
|
@@ -24,11 +24,11 @@
|
||
|
|
# 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_NORMAL "@defaultPathNormal@"
|
||
|
|
+#define DEFAULT_PATH_NORMAL_NULSTR "@defaultPathNormal@\0"
|
||
|
|
#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("/")
|
||
|
|
+#define DEFAULT_PATH_COMPAT DEFAULT_PATH_NORMAL
|
||
|
|
|
||
|
|
#if HAVE_SPLIT_USR
|
||
|
|
# define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR
|
||
|
|
--
|
||
|
|
2.25.1
|
||
|
|
|