shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-05 23:51:28 +03:00
Code

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

Browse Source 
Revert "hwdb: actually search /run/udev/hwdb.d"
This commit is contained in:
Kay Sievers 2015-06-09 11:35:59 +02:00
commit d7684c0f07
3 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/hwdb/hwdb.c
View File

@ -43,7 +43,6 @@ static const char *arg_root = "";
static const char * const conf_file_dirs[] = { static const char * const conf_file_dirs[] = {
"/etc/udev/hwdb.d", "/etc/udev/hwdb.d",
"/run/udev/hwdb.d",
UDEVLIBEXECDIR "/hwdb.d", UDEVLIBEXECDIR "/hwdb.d",
NULL NULL
}; };

1
src/udev/udevadm-hwdb.c
View File

@ -37,7 +37,6 @@
static const char * const conf_file_dirs[] = { static const char * const conf_file_dirs[] = {
"/etc/udev/hwdb.d", "/etc/udev/hwdb.d",
"/run/udev/hwdb.d",
UDEVLIBEXECDIR "/hwdb.d", UDEVLIBEXECDIR "/hwdb.d",
NULL NULL
}; };

1
units/systemd-hwdb-update.service.in
View File

@ -16,7 +16,6 @@ ConditionNeedsUpdate=/etc
ConditionPathExists=|!@udevlibexecdir@/hwdb.bin ConditionPathExists=|!@udevlibexecdir@/hwdb.bin
ConditionPathExists=|/etc/udev/hwdb.bin ConditionPathExists=|/etc/udev/hwdb.bin
ConditionDirectoryNotEmpty=|/etc/udev/hwdb.d/ ConditionDirectoryNotEmpty=|/etc/udev/hwdb.d/
ConditionDirectoryNotEmpty=|/run/udev/hwdb.d/
[Service] [Service]
Type=oneshot Type=oneshot