mirror of
https://github.com/systemd/systemd.git
synced 2024-11-05 15:21:37 +03:00
Merge pull request #120 from systemd/revert-115-master
Revert "hwdb: actually search /run/udev/hwdb.d"
This commit is contained in:
commit
d7684c0f07
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user