chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: kmod, hwdb - do not fail if databases are not available
[elogind.git]
/
src
/
udev
/
udev-builtin-hwdb.c
diff --git
a/src/udev/udev-builtin-hwdb.c
b/src/udev/udev-builtin-hwdb.c
index 1458795e993bb151d69b0164421aafc725f71081..c1a6f5c791b52d3e8096cb13daacb995c42b2e87 100644
(file)
--- a/
src/udev/udev-builtin-hwdb.c
+++ b/
src/udev/udev-builtin-hwdb.c
@@
-307,6
+307,9
@@
static int builtin_hwdb_init(struct udev *udev)
struct stat st;
const char sig[] = HWDB_SIG;
struct stat st;
const char sig[] = HWDB_SIG;
+ if (trie.f)
+ return 0;
+
trie.f = fopen(SYSCONFDIR "/udev/hwdb.bin", "re");
if (!trie.f)
return -errno;
trie.f = fopen(SYSCONFDIR "/udev/hwdb.bin", "re");
if (!trie.f)
return -errno;
@@
-361,7
+364,7
@@
static bool builtin_hwdb_validate(struct udev *udev)
struct stat st;
if (!trie.f)
struct stat st;
if (!trie.f)
- return
tru
e;
+ return
fals
e;
if (fstat(fileno(trie.f), &st) < 0)
return true;
if (trie.file_time_usec != ts_usec(&st.st_mtim))
if (fstat(fileno(trie.f), &st) < 0)
return true;
if (trie.file_time_usec != ts_usec(&st.st_mtim))