Merge pull request #115 from whot/master

hwdb: actually search /run/udev/hwdb.d
This commit is contained in:
Martin Pitt
2015-06-09 07:19:49 +02:00
3 changed files with 3 additions and 0 deletions
+1
View File
@@ -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
};
+1
View File
@@ -37,6 +37,7 @@
static const char * const conf_file_dirs[] = {
"/etc/udev/hwdb.d",
"/run/udev/hwdb.d",
UDEVLIBEXECDIR "/hwdb.d",
NULL
};
+1
View File
@@ -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