Merge pull request #120 from systemd/revert-115-master

Revert "hwdb: actually search /run/udev/hwdb.d"
2015-06-09 11:35:59 +02:00
parent 4b955cb9bc efbea94798
commit d7684c0f07
3 changed files with 0 additions and 3 deletions
@@ -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
 };
@@ -37,7 +37,6 @@

 static const char * const conf_file_dirs[] = {
        "/etc/udev/hwdb.d",
-        "/run/udev/hwdb.d",
        UDEVLIBEXECDIR "/hwdb.d",
        NULL
 };
@@ -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