Merge pull request #17109 from fbuihuu/udev-opts-tweaks
Udev opts tweaks
This commit is contained in:
commit
2b2919a5ff
|
@ -263,8 +263,8 @@
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><varname>udev.log_priority=</varname></term>
|
<term><varname>udev.log_level=</varname></term>
|
||||||
<term><varname>rd.udev.log_priority=</varname></term>
|
<term><varname>rd.udev.log_level=</varname></term>
|
||||||
<term><varname>udev.children_max=</varname></term>
|
<term><varname>udev.children_max=</varname></term>
|
||||||
<term><varname>rd.udev.children_max=</varname></term>
|
<term><varname>rd.udev.children_max=</varname></term>
|
||||||
<term><varname>udev.exec_delay=</varname></term>
|
<term><varname>udev.exec_delay=</varname></term>
|
||||||
|
|
|
@ -143,8 +143,8 @@
|
||||||
<para>Parameters prefixed with "rd." will be read when <command>systemd-udevd</command> is used in an
|
<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>
|
initrd, those without will be processed both in the initrd and on the host.</para>
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><varname>udev.log_priority=</varname></term>
|
<term><varname>udev.log_level=</varname></term>
|
||||||
<term><varname>rd.udev.log_priority=</varname></term>
|
<term><varname>rd.udev.log_level=</varname></term>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>Set the log level.</para>
|
<para>Set the log level.</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
|
|
@ -398,7 +398,7 @@
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><option>-l</option></term>
|
<term><option>-l</option></term>
|
||||||
<term><option>--log-priority=<replaceable>value</replaceable></option></term>
|
<term><option>--log-level=<replaceable>value</replaceable></option></term>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>Set the internal log level of
|
<para>Set the internal log level of
|
||||||
<filename>systemd-udevd</filename>. Valid values are the
|
<filename>systemd-udevd</filename>. Valid values are the
|
||||||
|
|
|
@ -34,7 +34,7 @@ static int help(void) {
|
||||||
" -h --help Show this help\n"
|
" -h --help Show this help\n"
|
||||||
" -V --version Show package version\n"
|
" -V --version Show package version\n"
|
||||||
" -e --exit Instruct the daemon to cleanup and exit\n"
|
" -e --exit Instruct the daemon to cleanup and exit\n"
|
||||||
" -l --log-priority=LEVEL Set the udev log level for the daemon\n"
|
" -l --log-level=LEVEL Set the udev log level for the daemon\n"
|
||||||
" -s --stop-exec-queue Do not execute events, queue only\n"
|
" -s --stop-exec-queue Do not execute events, queue only\n"
|
||||||
" -S --start-exec-queue Execute events, flush queue\n"
|
" -S --start-exec-queue Execute events, flush queue\n"
|
||||||
" -R --reload Reload rules and databases\n"
|
" -R --reload Reload rules and databases\n"
|
||||||
|
@ -58,7 +58,8 @@ int control_main(int argc, char *argv[], void *userdata) {
|
||||||
|
|
||||||
static const struct option options[] = {
|
static const struct option options[] = {
|
||||||
{ "exit", no_argument, NULL, 'e' },
|
{ "exit", no_argument, NULL, 'e' },
|
||||||
{ "log-priority", required_argument, NULL, 'l' },
|
{ "log-level", required_argument, NULL, 'l' },
|
||||||
|
{ "log-priority", required_argument, NULL, 'l' }, /* for backward compatibility */
|
||||||
{ "stop-exec-queue", no_argument, NULL, 's' },
|
{ "stop-exec-queue", no_argument, NULL, 's' },
|
||||||
{ "start-exec-queue", no_argument, NULL, 'S' },
|
{ "start-exec-queue", no_argument, NULL, 'S' },
|
||||||
{ "reload", no_argument, NULL, 'R' },
|
{ "reload", no_argument, NULL, 'R' },
|
||||||
|
@ -98,11 +99,11 @@ int control_main(int argc, char *argv[], void *userdata) {
|
||||||
case 'l':
|
case 'l':
|
||||||
r = log_level_from_string(optarg);
|
r = log_level_from_string(optarg);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return log_error_errno(r, "Failed to parse log priority '%s': %m", optarg);
|
return log_error_errno(r, "Failed to parse log level '%s': %m", optarg);
|
||||||
|
|
||||||
r = udev_ctrl_send_set_log_level(uctrl, r);
|
r = udev_ctrl_send_set_log_level(uctrl, r);
|
||||||
if (r == -ENOANO)
|
if (r == -ENOANO)
|
||||||
log_warning("Cannot specify --log-priority after --exit, ignoring.");
|
log_warning("Cannot specify --log-level after --exit, ignoring.");
|
||||||
else if (r < 0)
|
else if (r < 0)
|
||||||
return log_error_errno(r, "Failed to send request to set log level: %m");
|
return log_error_errno(r, "Failed to send request to set log level: %m");
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -1050,7 +1050,7 @@ static int on_ctrl_msg(struct udev_ctrl *uctrl, enum udev_ctrl_msg_type type, co
|
||||||
|
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case UDEV_CTRL_SET_LOG_LEVEL:
|
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_UDEV, value->intval);
|
||||||
log_set_max_level_realm(LOG_REALM_SYSTEMD, value->intval);
|
log_set_max_level_realm(LOG_REALM_SYSTEMD, value->intval);
|
||||||
manager_kill_workers(manager);
|
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
|
* 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.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.exec_delay=<number of seconds> delay execution of every executed program
|
||||||
* udev.event_timeout=<number of seconds> seconds to wait before terminating an event
|
* 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);
|
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))
|
if (proc_cmdline_value_missing(key, value))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -297,7 +297,7 @@ rd.systemd.verity=
|
||||||
rd.udev.children_max=
|
rd.udev.children_max=
|
||||||
rd.udev.event_timeout=
|
rd.udev.event_timeout=
|
||||||
rd.udev.exec_delay=
|
rd.udev.exec_delay=
|
||||||
rd.udev.log_priority=
|
rd.udev.log_level=
|
||||||
resume=
|
resume=
|
||||||
resumeflags=
|
resumeflags=
|
||||||
root=
|
root=
|
||||||
|
@ -331,7 +331,7 @@ systemd.watchdog_device=
|
||||||
udev.children_max=
|
udev.children_max=
|
||||||
udev.event_timeout=
|
udev.event_timeout=
|
||||||
udev.exec_delay=
|
udev.exec_delay=
|
||||||
udev.log_priority=
|
udev.log_level=
|
||||||
vconsole.font=
|
vconsole.font=
|
||||||
vconsole.font_map=
|
vconsole.font_map=
|
||||||
vconsole.font_unimap=
|
vconsole.font_unimap=
|
||||||
|
|
Loading…
Reference in New Issue