hwdb: actually search /run/udev/hwdb.d

The documentation claims hwdb entries may be placed in the volatile
/run/udev/hwdb.d directory but nothing actually looked at it.

diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c
index 446de3a2fc330f4f10d52fec816e5d376ee719ea..62b76c9e893a265393011237d3c65d0b0f2b821a 100644 (file)
--- a/src/hwdb/hwdb.c
+++ b/src/hwdb/hwdb.c
@@ -43,6 +43,7 @@ static const char *arg_root = "";
 
 static const char * const conf_file_dirs[] = {
         "/etc/udev/hwdb.d",
+        "/run/udev/hwdb.d",
         UDEVLIBEXECDIR "/hwdb.d",
         NULL
 };

diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c
index 00609e31b52202d4af5ef76d5c32a07fc1c473de..4c933de696e45252905c7d9efb5e3099a49cf778 100644 (file)
--- a/src/udev/udevadm-hwdb.c
+++ b/src/udev/udevadm-hwdb.c
@@ -37,6 +37,7 @@
 
 static const char * const conf_file_dirs[] = {
         "/etc/udev/hwdb.d",
+        "/run/udev/hwdb.d",
         UDEVLIBEXECDIR "/hwdb.d",
         NULL
 };

diff --git a/units/systemd-hwdb-update.service.in b/units/systemd-hwdb-update.service.in
index 7135cff3d9b413281e83d0bed0bf4bb39fa127f1..d13383d55d202eec759d19f4eeeec6c5670c5e81 100644 (file)
--- a/units/systemd-hwdb-update.service.in
+++ b/units/systemd-hwdb-update.service.in
@@ -16,6 +16,7 @@ ConditionNeedsUpdate=/etc
 ConditionPathExists=|!@udevlibexecdir@/hwdb.bin
 ConditionPathExists=|/etc/udev/hwdb.bin
 ConditionDirectoryNotEmpty=|/etc/udev/hwdb.d/
+ConditionDirectoryNotEmpty=|/run/udev/hwdb.d/
 
 [Service]
 Type=oneshot