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

2015-06-09 11:26:06 +02:00 · 2015-06-09 11:26:06 +02:00 · efbea94798
parent 4b955cb9bc
commit efbea94798
3 changed files with 0 additions and 3 deletions
--- 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
 };
--- 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
 };
--- 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