diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2015-06-09 07:19:49 +0200 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2015-06-09 07:19:49 +0200 |
| commit | fba3d902b49e1f4654b36c9d4311def4a084c3a7 (patch) | |
| tree | e312b30b5ffc961d15bff5ad77550431e6db764e | |
| parent | 6f90fe6de6c1086502d300bfc54b8b19c59a22a9 (diff) | |
| parent | 03dfe7b749796c10074b5ebc5e9c3f947d726104 (diff) | |
Merge pull request #115 from whot/master
hwdb: actually search /run/udev/hwdb.d
| -rw-r--r-- | src/hwdb/hwdb.c | 1 | ||||
| -rw-r--r-- | src/udev/udevadm-hwdb.c | 1 | ||||
| -rw-r--r-- | units/systemd-hwdb-update.service.in | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c index 446de3a2fc..62b76c9e89 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 00609e31b5..4c933de696 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 7135cff3d9..d13383d55d 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 |