From 027f96c8514bd179a0dee64d624cad18fdc25e3f Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 21 Sep 2020 11:22:12 +0200 Subject: [PATCH] udevadm: rename option '--log-priority' into '--log-level' Let's be consistent with systemctl(1). '--log-priority' i still kept only for backward compatibility. --- man/udevadm.xml | 2 +- src/udev/udevadm-control.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/man/udevadm.xml b/man/udevadm.xml index a716b1819d..c78faa5a06 100644 --- a/man/udevadm.xml +++ b/man/udevadm.xml @@ -398,7 +398,7 @@ - + Set the internal log level of systemd-udevd. Valid values are the diff --git a/src/udev/udevadm-control.c b/src/udev/udevadm-control.c index 82e2514932..6096dcbe78 100644 --- a/src/udev/udevadm-control.c +++ b/src/udev/udevadm-control.c @@ -34,7 +34,7 @@ static int help(void) { " -h --help Show this help\n" " -V --version Show package version\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 --start-exec-queue Execute events, flush queue\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[] = { { "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' }, { "start-exec-queue", no_argument, NULL, 'S' }, { "reload", no_argument, NULL, 'R' }, @@ -98,11 +99,11 @@ int control_main(int argc, char *argv[], void *userdata) { case 'l': r = log_level_from_string(optarg); 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); 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) return log_error_errno(r, "Failed to send request to set log level: %m"); break;