shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-22 09:57:34 +03:00
Code

udev: rename kernel option 'log_priority' into 'log_level'

Browse Source 
Let's be consistent with the rest of the project.

'log_priority' is still supported for backward compatibility.
This commit is contained in:
Franck Bui 2020-09-21 11:10:50 +02:00
parent 8a4024120f
commit 64a3494c3d
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
man/kernel-command-line.xml
View File

@ -263,8 +263,8 @@
</varlistentry>
<varlistentry>
<term><varname>udev.log_priority=</varname></term>
<term><varname>rd.udev.log_priority=</varname></term>
<term><varname>udev.log_level=</varname></term>
<term><varname>rd.udev.log_level=</varname></term>
<term><varname>udev.children_max=</varname></term>
<term><varname>rd.udev.children_max=</varname></term>
<term><varname>udev.exec_delay=</varname></term>

4
man/systemd-udevd.service.xml
View File

@ -143,8 +143,8 @@
<para>Parameters prefixed with "rd." will be read when <command>systemd-udevd</command> is used in an
initrd, those without will be processed both in the initrd and on the host.</para>
<varlistentry>
<term><varname>udev.log_priority=</varname></term>
<term><varname>rd.udev.log_priority=</varname></term>
<term><varname>udev.log_level=</varname></term>
<term><varname>rd.udev.log_level=</varname></term>
<listitem>
<para>Set the log level.</para>
</listitem>

7
src/udev/udevd.c
View File

@ -1050,7 +1050,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_priority=%i", value->intval);
log_debug("Received udev control message (SET_LOG_LEVEL), setting log_level=%i", value->intval);
log_set_max_level_realm(LOG_REALM_UDEV, value->intval);
log_set_max_level_realm(LOG_REALM_SYSTEMD, value->intval);
manager_kill_workers(manager);
@ -1467,7 +1467,7 @@ static int listen_fds(int *ret_ctrl, int *ret_netlink) {
/*
* read the kernel command line, in case we need to get into debug mode
* udev.log_priority=<level> syslog priority
* udev.log_level=<level> syslog priority
* udev.children_max=<number of workers> events are fully serialized if set to 1
* udev.exec_delay=<number of seconds> delay execution of every executed program
* udev.event_timeout=<number of seconds> seconds to wait before terminating an event
@ -1478,7 +1478,8 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
assert(key);
if (proc_cmdline_key_streq(key, "udev.log_priority")) {
if (proc_cmdline_key_streq(key, "udev.log_level") ||
proc_cmdline_key_streq(key, "udev.log_priority")) { /* kept for backward compatibility */
if (proc_cmdline_value_missing(key, value))
return 0;

4
test/fuzz/fuzz-unit-file/directives.service
View File

@ -297,7 +297,7 @@ rd.systemd.verity=
rd.udev.children_max=
rd.udev.event_timeout=
rd.udev.exec_delay=
rd.udev.log_priority=
rd.udev.log_level=
resume=
resumeflags=
root=
@ -331,7 +331,7 @@ systemd.watchdog_device=
udev.children_max=
udev.event_timeout=
udev.exec_delay=
udev.log_priority=
udev.log_level=
vconsole.font=
vconsole.font_map=
vconsole.font_unimap=