Merge pull request #115 from whot/master

hwdb: actually search /run/udev/hwdb.d
2015-06-09 07:19:49 +02:00 · 2015-06-09 07:19:49 +02:00 · fba3d902b4
parent 6f90fe6de6 03dfe7b749
commit fba3d902b4
3 changed files with 3 additions and 0 deletions
--- 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
 };
--- 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
 };
--- 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