]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
udev: make udevadm and friends not warn about unknown settings
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 21 Mar 2025 00:54:45 +0000 (09:54 +0900)
committerLuca Boccassi <luca.boccassi@gmail.com>
Tue, 8 Apr 2025 19:52:11 +0000 (20:52 +0100)
Without this change, when e.g. event_timeout= is specified in udev.conf,
udevadm and friends which loads udev.conf warn about unknown key:
===
$ udevadm info /sys/class/net/lo
/run/udev/udev.conf.d/test-17.conf:1: Unknown key 'event_timeout', ignoring.
/run/udev/udev.conf.d/test-17.conf:2: Unknown key 'timeout_signal', ignoring.
===

Follow-up for 07f5e35fe7967c824a87f18a3a1d3c22e5be70f5 (v256).

(cherry picked from commit 90670111a9f18aff7d37fa3ec3bc5b73ce3b784d)
(cherry picked from commit b989696f76902558f781a1dc9aae25e0a8dc1cc4)

src/shared/udev-util.c

index 15996ca7247428e035133f313b152c768125afe9..1f4ded64848c51ad49a31e573098248bfd9d814c 100644 (file)
@@ -42,7 +42,12 @@ int udev_parse_config_full(const ConfigTableItem config_table[]) {
 int udev_parse_config(void) {
         int r, log_val = -1;
         const ConfigTableItem config_table[] = {
-                { NULL, "udev_log", config_parse_log_level, 0, &log_val },
+                { NULL, "udev_log",       config_parse_log_level, 0, &log_val },
+                { NULL, "children_max",   NULL,                   0, NULL     },
+                { NULL, "exec_delay",     NULL,                   0, NULL     },
+                { NULL, "event_timeout",  NULL,                   0, NULL     },
+                { NULL, "resolve_names",  NULL,                   0, NULL     },
+                { NULL, "timeout_signal", NULL,                   0, NULL     },
                 {}
         };