From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 9 Jun 2015 00:58:06 +0000 (+1000)
Subject: hwdb: actually search /run/udev/hwdb.d
X-Git-Tag: v221~164^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F115%2Fhead;p=thirdparty%2Fsystemd.git

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 446de3a2fc3..62b76c9e893 100644
--- 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 00609e31b52..4c933de696e 100644
--- 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 7135cff3d9b..d13383d55d2 100644
--- 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