diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2020-11-01 15:35:11 +0100 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2020-12-02 23:40:04 +0100 |
| commit | ef050bc3d18d4c72da4ba238fccbf0d82565eeb9 (patch) | |
| tree | 9fde2716e10cf1216538e2f75bf0aa5a401fde77 /pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch | |
| parent | b83ed81c33567d2dc6f28d4cba8fd99e8394d282 (diff) | |
| download | nixpkgs-ef050bc3d18d4c72da4ba238fccbf0d82565eeb9.tar nixpkgs-ef050bc3d18d4c72da4ba238fccbf0d82565eeb9.tar.gz nixpkgs-ef050bc3d18d4c72da4ba238fccbf0d82565eeb9.tar.bz2 nixpkgs-ef050bc3d18d4c72da4ba238fccbf0d82565eeb9.tar.lz nixpkgs-ef050bc3d18d4c72da4ba238fccbf0d82565eeb9.tar.xz nixpkgs-ef050bc3d18d4c72da4ba238fccbf0d82565eeb9.tar.zst nixpkgs-ef050bc3d18d4c72da4ba238fccbf0d82565eeb9.zip | |
systemd: 246.6 -> 247-rc2
Diffstat (limited to 'pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch deleted file mode 100644 index bf011f701ec..00000000000 --- a/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 42419ff4dc7a36607189f8d3765aa836d5c5eaf9 Mon Sep 17 00:00:00 2001 -From: Florian Klink <flokli@flokli.de> -Date: Sun, 8 Mar 2020 01:05:54 +0100 -Subject: [PATCH 18/18] 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 30031fca8e..d97145539a 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.28.0 - |