2021-03-31 16:24:19 +00:00
|
|
|
From 874698425f6d68fc0d662cb17c7c29e0af3e8c25 Mon Sep 17 00:00:00 2001
|
2020-01-26 13:56:41 +00:00
|
|
|
From: Nikolay Amiantov <ab@fmap.me>
|
|
|
|
|
Date: Thu, 7 Jul 2016 02:47:13 +0300
|
2021-03-31 16:24:19 +00:00
|
|
|
Subject: [PATCH 08/19] Fix hwdb paths
|
2020-01-26 13:56:41 +00:00
|
|
|
|
|
|
|
|
Patch by vcunat.
|
|
|
|
|
---
|
|
|
|
|
src/libsystemd/sd-hwdb/sd-hwdb.c | 7 +------
|
|
|
|
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c
|
2020-11-01 14:35:11 +00:00
|
|
|
index cb3c77ce96..7b8c80071f 100644
|
2020-01-26 13:56:41 +00:00
|
|
|
--- a/src/libsystemd/sd-hwdb/sd-hwdb.c
|
|
|
|
|
+++ b/src/libsystemd/sd-hwdb/sd-hwdb.c
|
2020-04-29 23:03:18 +00:00
|
|
|
@@ -297,13 +297,8 @@ static int trie_search_f(sd_hwdb *hwdb, const char *search) {
|
2020-01-26 13:56:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const char hwdb_bin_paths[] =
|
|
|
|
|
- "/etc/systemd/hwdb/hwdb.bin\0"
|
|
|
|
|
"/etc/udev/hwdb.bin\0"
|
|
|
|
|
- "/usr/lib/systemd/hwdb/hwdb.bin\0"
|
|
|
|
|
-#if HAVE_SPLIT_USR
|
|
|
|
|
- "/lib/systemd/hwdb/hwdb.bin\0"
|
|
|
|
|
-#endif
|
|
|
|
|
- UDEVLIBEXECDIR "/hwdb.bin\0";
|
|
|
|
|
+ ;
|
|
|
|
|
|
|
|
|
|
_public_ int sd_hwdb_new(sd_hwdb **ret) {
|
|
|
|
|
_cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL;
|
|
|
|
|
--
|
2021-03-31 16:24:19 +00:00
|
|
|
2.30.1
|
2020-01-26 13:56:41 +00:00
|
|
|
|
