From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 9 Jun 2015 09:26:06 +0000 (+0200)
Subject: Revert "hwdb: actually search /run/udev/hwdb.d"
X-Git-Tag: v221~159^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F120%2Fhead;p=thirdparty%2Fsystemd.git

Revert "hwdb: actually search /run/udev/hwdb.d"
---

diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c
index 62b76c9e893..446de3a2fc3 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 4c933de696e..00609e31b52 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 d13383d55d2..7135cff3d9b 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