From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 10 Jan 2025 21:07:55 +0000 (+0900)
Subject: udev-rules: do not change maximum log level when running in test mode
X-Git-Tag: v258-rc1~1609^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F36005%2Fhead;p=thirdparty%2Fsystemd.git

udev-rules: do not change maximum log level when running in test mode

When udev rules are being tested, log level specified by SYSTEMD_LOG_LEVEL=
environment variable should be honored, and should not be overridden by
the rules.
---

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 4aacba6f0fb..3687748993a 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -2395,11 +2395,18 @@ static int udev_rule_apply_token_to_event(
                 if (level < 0)
                         level = event->default_log_level;
 
-                log_set_max_level(level);
+                if (event->event_mode == EVENT_UDEV_WORKER)
+                        log_set_max_level(level);
+                else {
+                        _cleanup_free_ char *level_str = NULL;
+                        (void) log_level_to_string_alloc(level, &level_str);
+                        log_event_debug(dev, token, "Running in test mode, skipping changing maximum log level to %s.", strna(level_str));
+                }
 
                 if (level == LOG_DEBUG && !event->log_level_was_debug) {
                         /* The log level becomes LOG_DEBUG at first time. Let's log basic information. */
-                        log_device_uevent(dev, "The log level is changed to 'debug' while processing device");
+                        if (event->event_mode == EVENT_UDEV_WORKER)
+                                log_device_uevent(dev, "The log level is changed to 'debug' while processing device");
                         event->log_level_was_debug = true;
                 }