From 3cc6b14a87f813bfdda36fe3ca0e65888cffd0b2 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 17 Jan 2021 13:32:29 +0900 Subject: [PATCH] udev: stop to use LOG_REALM_UDEV Before this commit, udevd is built with LOG_REALM=LOG_REALM_UDEV. However, log level specified by e.g. environment variable or kernel command line option are also passed to LOG_REALM_SYSTEMD. So, the maximum log level for the two realms are always equivalent, and it is not necessary to specify the build option. Hence drop it. --- meson.build | 1 - src/shared/udev-util.c | 2 +- src/test/meson.build | 2 +- src/udev/fuzz-udev-rules.c | 6 ++---- src/udev/meson.build | 2 -- src/udev/udev-rules.c | 2 +- src/udev/udevadm.c | 2 -- src/udev/udevd.c | 6 ++---- 8 files changed, 7 insertions(+), 16 deletions(-) diff --git a/meson.build b/meson.build index 9b47e6ad03..6d18355b0c 100644 --- a/meson.build +++ b/meson.build @@ -3161,7 +3161,6 @@ public_programs += executable( public_programs += executable( 'udevadm', udevadm_sources, - c_args : '-DLOG_REALM=LOG_REALM_UDEV', include_directories : includes, link_with : [libudevd_core], dependencies : [versiondep, diff --git a/src/shared/udev-util.c b/src/shared/udev-util.c index df08e3a40e..61decb80fa 100644 --- a/src/shared/udev-util.c +++ b/src/shared/udev-util.c @@ -68,7 +68,7 @@ int udev_parse_config_full( /* we set the udev log level here explicitly, this is supposed * to regulate the code in libudev/ and udev/. */ - r = log_set_max_level_from_string_realm(LOG_REALM_UDEV, log); + r = log_set_max_level_from_string(log); if (r < 0) log_syntax(NULL, LOG_WARNING, "/etc/udev/udev.conf", 0, r, "failed to set udev log level '%s', ignoring: %m", log); diff --git a/src/test/meson.build b/src/test/meson.build index 81c1335045..93870e8773 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -527,7 +527,7 @@ tests += [ libkmod, libacl, libselinux], - udev_includes, '', 'manual', '-DLOG_REALM=LOG_REALM_UDEV'], + udev_includes, '', 'manual'], [['src/test/test-udev-util.c']], diff --git a/src/udev/fuzz-udev-rules.c b/src/udev/fuzz-udev-rules.c index e1140bc68e..17f5ea121b 100644 --- a/src/udev/fuzz-udev-rules.c +++ b/src/udev/fuzz-udev-rules.c @@ -15,10 +15,8 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { _cleanup_(unlink_tempfilep) char filename[] = "/tmp/fuzz-udev-rules.XXXXXX"; int r; - if (!getenv("SYSTEMD_LOG_LEVEL")) { - log_set_max_level_realm(LOG_REALM_UDEV, LOG_CRIT); - log_set_max_level_realm(LOG_REALM_SYSTEMD, LOG_CRIT); - } + if (!getenv("SYSTEMD_LOG_LEVEL")) + log_set_max_level(LOG_CRIT); assert_se(fmkostemp_safe(filename, "r+", &f) == 0); if (size != 0) diff --git a/src/udev/meson.build b/src/udev/meson.build index 68b4a67e94..9e97691d77 100644 --- a/src/udev/meson.build +++ b/src/udev/meson.build @@ -112,7 +112,6 @@ libudevd_core = static_library( link_config_gperf_c, keyboard_keys_from_name_h, include_directories : udev_includes, - c_args : ['-DLOG_REALM=LOG_REALM_UDEV'], link_with : udev_link_with, dependencies : [libblkid, libkmod]) @@ -142,7 +141,6 @@ foreach prog : udev_id_progs name, prog, include_directories : includes, - c_args : ['-DLOG_REALM=LOG_REALM_UDEV'], dependencies : [versiondep], link_with : udev_link_with, install_rpath : udev_rpath, diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index 66eef11d05..e72013ea56 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -1868,7 +1868,7 @@ static int udev_rule_apply_token_to_event( if (level < 0) level = event->default_log_level; - log_set_max_level_all_realms(level); + log_set_max_level(level); if (level == LOG_DEBUG && !event->log_level_was_debug) { /* The log level becomes LOG_DEBUG at first time. Let's log basic information. */ diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c index 408e4a3467..39e40411b1 100644 --- a/src/udev/udevadm.c +++ b/src/udev/udevadm.c @@ -122,8 +122,6 @@ static int run(int argc, char *argv[]) { if (r <= 0) return r; - log_set_max_level_realm(LOG_REALM_SYSTEMD, log_get_max_level()); - r = mac_selinux_init(); if (r < 0) return r; diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 84d05d79f3..a19232bd4e 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -537,7 +537,7 @@ static int worker_device_monitor_handler(sd_device_monitor *monitor, sd_device * log_device_warning_errno(dev, r, "Failed to send signal to main daemon, ignoring: %m"); /* Reset the log level, as it might be changed by "OPTIONS=log_level=". */ - log_set_max_level_all_realms(manager->log_level); + log_set_max_level(manager->log_level); return 1; } @@ -1062,7 +1062,7 @@ static int on_ctrl_msg(struct udev_ctrl *uctrl, enum udev_ctrl_msg_type type, co switch (type) { case UDEV_CTRL_SET_LOG_LEVEL: log_debug("Received udev control message (SET_LOG_LEVEL), setting log_level=%i", value->intval); - log_set_max_level_all_realms(value->intval); + log_set_max_level(value->intval); manager->log_level = value->intval; manager_kill_workers(manager); break; @@ -1852,8 +1852,6 @@ int run_udevd(int argc, char *argv[]) { log_set_max_level(LOG_DEBUG); } - log_set_max_level_realm(LOG_REALM_SYSTEMD, log_get_max_level()); - r = must_be_root(); if (r < 0) return r;