summaryrefslogtreecommitdiffstats
path: root/src/hwdb/hwdb.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-12 03:50:40 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-12 03:50:40 +0000
commitfc53809803cd2bc2434e312b19a18fa36776da12 (patch)
treeb4b43bd6538f51965ce32856e9c053d0f90919c8 /src/hwdb/hwdb.c
parentAdding upstream version 255.5. (diff)
downloadsystemd-fc53809803cd2bc2434e312b19a18fa36776da12.tar.xz
systemd-fc53809803cd2bc2434e312b19a18fa36776da12.zip
Adding upstream version 256.upstream/256
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--src/hwdb/hwdb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c
index 4287b1f..2ce8b2d 100644
--- a/src/hwdb/hwdb.c
+++ b/src/hwdb/hwdb.c
@@ -22,6 +22,9 @@ static int verb_query(int argc, char *argv[], void *userdata) {
}
static int verb_update(int argc, char *argv[], void *userdata) {
+ if (hwdb_bypass())
+ return 0;
+
return hwdb_update(arg_root, arg_hwdb_bin_dir, arg_strict, false);
}
@@ -117,8 +120,7 @@ static int hwdb_main(int argc, char *argv[]) {
static int run(int argc, char *argv[]) {
int r;
- log_parse_environment();
- log_open();
+ log_setup();
r = parse_argv(argc, argv);
if (r <= 0)