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

diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c
index 62b76c9e893a265393011237d3c65d0b0f2b821a..446de3a2fc330f4f10d52fec816e5d376ee719ea 100644 (file)
--- a/src/hwdb/hwdb.c
+++ b/src/hwdb/hwdb.c
@@ -43,7 +43,6 @@ 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 4c933de696e45252905c7d9efb5e3099a49cf778..00609e31b52202d4af5ef76d5c32a07fc1c473de 100644 (file)
--- a/src/udev/udevadm-hwdb.c
+++ b/src/udev/udevadm-hwdb.c
@@ -37,7 +37,6 @@
 
 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 d13383d55d202eec759d19f4eeeec6c5670c5e81..7135cff3d9b413281e83d0bed0bf4bb39fa127f1 100644 (file)
--- a/units/systemd-hwdb-update.service.in
+++ b/units/systemd-hwdb-update.service.in
@@ -16,7 +16,6 @@ ConditionNeedsUpdate=/etc
 ConditionPathExists=|!@udevlibexecdir@/hwdb.bin
 ConditionPathExists=|/etc/udev/hwdb.bin
 ConditionDirectoryNotEmpty=|/etc/udev/hwdb.d/
-ConditionDirectoryNotEmpty=|/run/udev/hwdb.d/
 
 [Service]
 Type=oneshot