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

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

'log_priority' is still supported for backward compatibility.

diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index b67639c92e5709e618e851597161e1d2b6c34c15..b0b45f4c62fc79f830fba691c0a3336aa61ec089 100644 (file)
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -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>

diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
index da7389c7318e388c16ad7d792a8be6ca7705ecfd..e49690dc74b2c78d7ec78be06a11b41b581f9c23 100644 (file)
--- a/man/systemd-udevd.service.xml
+++ b/man/systemd-udevd.service.xml
@@ -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>

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 22dad2acafa0969047338e3fe0b7ddaefd379255..d6415ad57e9a51f9cda531eef70ca6d3dc0133de 100644 (file)
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -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;

diff --git a/test/fuzz/fuzz-unit-file/directives.service b/test/fuzz/fuzz-unit-file/directives.service
index 21a04cfba7c365ad9b1f2eb3aeb2ed032f50860c..eebc89f5c2391c296625eff7c038c6d2ebcbdca7 100644 (file)
--- a/test/fuzz/fuzz-unit-file/directives.service
+++ b/test/fuzz/fuzz-unit-file/directives.service
@@ -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=