We merged the other PR without reflowing the patches to make reviewing and rebasing easier. Reflow the patches now so that they are consistent again.
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Rammhold <andreas@rammhold.de>
|
|
Date: Thu, 9 May 2019 11:15:22 +0200
|
|
Subject: [PATCH] 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/constants.h | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/basic/constants.h b/src/basic/constants.h
|
|
index 3dbffdee26..d3c3a1b067 100644
|
|
--- a/src/basic/constants.h
|
|
+++ b/src/basic/constants.h
|
|
@@ -40,13 +40,15 @@
|
|
"/etc/" n "\0" \
|
|
"/run/" n "\0" \
|
|
"/usr/local/lib/" n "\0" \
|
|
- "/usr/lib/" n "\0"
|
|
+ "/usr/lib/" n "\0" \
|
|
+ PREFIX "/lib/" n "\0"
|
|
|
|
#define CONF_PATHS(n) \
|
|
"/etc/" n, \
|
|
"/run/" n, \
|
|
"/usr/local/lib/" n, \
|
|
- "/usr/lib/" n
|
|
+ "/usr/lib/" n, \
|
|
+ PREFIX "/lib/" n
|
|
|
|
#define CONF_PATHS_STRV(n) \
|
|
STRV_MAKE(CONF_PATHS(n))
|