pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch

   1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
   2 From: Florian Klink <flokli@flokli.de>
   3 Date: Sun, 8 Mar 2020 01:05:54 +0100
   4 Subject: [PATCH] path-util.h: add placeholder for DEFAULT_PATH_NORMAL
   5
   6 This will be the $PATH used to lookup ExecStart= etc. options, which
   7 systemd itself uses extensively.
   8 ---
   9  src/basic/path-util.h | 6 +++---
  10  1 file changed, 3 insertions(+), 3 deletions(-)
  11
  12 diff --git a/src/basic/path-util.h b/src/basic/path-util.h
  13 index fcb3aa9399..b9e69cbf91 100644
  14 --- a/src/basic/path-util.h
  15 +++ b/src/basic/path-util.h
  16 @@ -17,10 +17,10 @@
  17  #define PATH_MERGED_BIN(x) x "bin"
  18  #define PATH_MERGED_BIN_NULSTR(x) x "bin\0"
  19
  20 -#define DEFAULT_PATH_WITH_SBIN PATH_SPLIT_BIN("/usr/local/") ":" PATH_SPLIT_BIN("/usr/")
  21 -#define DEFAULT_PATH_WITHOUT_SBIN PATH_MERGED_BIN("/usr/local/") ":" PATH_MERGED_BIN("/usr/")
  22 +#define DEFAULT_PATH_WITH_SBIN "@defaultPathNormal@"
  23 +#define DEFAULT_PATH_WITHOUT_SBIN DEFAULT_PATH_WITH_SBIN
  24
  25 -#define DEFAULT_PATH_COMPAT PATH_SPLIT_BIN("/usr/local/") ":" PATH_SPLIT_BIN("/usr/") ":" PATH_SPLIT_BIN("/")
  26 +#define DEFAULT_PATH_COMPAT DEFAULT_PATH_WITH_SBIN
  27
  28  const char* default_PATH(void);
  29