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/0013-add-rootprefix-to-lookup-dir-paths.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/0013-add-rootprefix-to-lookup-dir-paths.patch')
-rw-r--r-- | pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch new file mode 100644 index 00000000000..51fc4cc30d7 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch @@ -0,0 +1,38 @@ +From d36d688e32b8f2368499af091c67a7825fadf5ad Mon Sep 17 00:00:00 2001 +From: Andreas Rammhold <andreas@rammhold.de> +Date: Thu, 9 May 2019 11:15:22 +0200 +Subject: [PATCH 13/18] add rootprefix to lookup dir paths + +systemd does not longer use the UDEVLIBEXEC directory as root for +discovery default udev rules. By adding `$out/lib` to the lookup paths +we should again be able to discover the udev rules amongst other default +files that I might have missed. +--- + src/basic/def.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/basic/def.h b/src/basic/def.h +index 2e60abb4f1..732ec51d36 100644 +--- a/src/basic/def.h ++++ b/src/basic/def.h +@@ -39,13 +39,15 @@ + "/run/" n "\0" \ + "/usr/local/lib/" n "\0" \ + "/usr/lib/" n "\0" \ +- _CONF_PATHS_SPLIT_USR_NULSTR(n) ++ _CONF_PATHS_SPLIT_USR_NULSTR(n) \ ++ ROOTPREFIX "/lib/" n "\0" + + #define CONF_PATHS_USR(n) \ + "/etc/" n, \ + "/run/" n, \ + "/usr/local/lib/" n, \ +- "/usr/lib/" n ++ "/usr/lib/" n, \ ++ ROOTPREFIX "/lib/" n + + #define CONF_PATHS(n) \ + CONF_PATHS_USR(n) \ +-- +2.29.2 + |