From efbea947980544574c66fa812edc5ebdcc8add04 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 9 Jun 2015 11:26:06 +0200 Subject: Revert "hwdb: actually search /run/udev/hwdb.d" --- src/hwdb/hwdb.c | 1 - src/udev/udevadm-hwdb.c | 1 - units/systemd-hwdb-update.service.in | 1 - 3 files changed, 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 -- cgit v1.2.3-54-g00ecf