c9183d3738
The ConditionFileNotEmpty override patch wasn't correct for stage1, which does have the modules in /lib. So, remove the patch and set the right path with overrides in the final system. Also, make sure systemd-tmpfiles-setup-dev is pulled in to create all the necessary symlinks.
26 lines
922 B
Diff
26 lines
922 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Nikolay Amiantov <ab@fmap.me>
|
|
Date: Thu, 7 Jul 2016 02:47:13 +0300
|
|
Subject: [PATCH] Fix hwdb paths
|
|
|
|
Patch by vcunat.
|
|
---
|
|
src/libsystemd/sd-hwdb/hwdb-internal.h | 7 ++-----
|
|
1 file changed, 2 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/src/libsystemd/sd-hwdb/hwdb-internal.h b/src/libsystemd/sd-hwdb/hwdb-internal.h
|
|
index 62d27f7b89..87318e041b 100644
|
|
--- a/src/libsystemd/sd-hwdb/hwdb-internal.h
|
|
+++ b/src/libsystemd/sd-hwdb/hwdb-internal.h
|
|
@@ -83,8 +83,5 @@ struct trie_value_entry2_f {
|
|
} _packed_;
|
|
|
|
#define hwdb_bin_paths \
|
|
- "/etc/systemd/hwdb/hwdb.bin\0" \
|
|
- "/etc/udev/hwdb.bin\0" \
|
|
- "/usr/lib/systemd/hwdb/hwdb.bin\0" \
|
|
- _CONF_PATHS_SPLIT_USR_NULSTR("systemd/hwdb/hwdb.bin") \
|
|
- UDEVLIBEXECDIR "/hwdb.bin\0"
|
|
+ "/etc/udev/hwdb.bin\0"
|
|
+
|