diff options
| author | Kay Sievers <kay@vrfy.org> | 2015-06-09 11:35:59 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2015-06-09 11:35:59 +0200 |
| commit | d7684c0f07283a6d8c8258447e6fb93763aeb8f1 (patch) | |
| tree | de6bb6ef69f90d044131fc32adad72f692cdf231 | |
| parent | 4b955cb9bc40b508b1eef0b7751f26526a598743 (diff) | |
| parent | efbea947980544574c66fa812edc5ebdcc8add04 (diff) | |
Merge pull request #120 from systemd/revert-115-master
Revert "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, 0 insertions, 3 deletions
diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c index 62b76c9e89..446de3a2fc 100644 --- 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 4c933de696..00609e31b5 100644 --- 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 d13383d55d..7135cff3d9 100644 --- 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 |