summaryrefslogtreecommitdiffstats
path: root/src/udev/udevadm-control.c
diff options
context:
space:
mode:
authorFranck Bui <fbui@suse.com>2020-09-21 11:22:12 +0200
committerFranck Bui <fbui@suse.com>2020-09-22 09:05:57 +0200
commit027f96c8514bd179a0dee64d624cad18fdc25e3f (patch)
treedd487021071e640c7aacb6f7822adf7403385576 /src/udev/udevadm-control.c
parentudev: rename kernel option 'log_priority' into 'log_level' (diff)
downloadsystemd-027f96c8514bd179a0dee64d624cad18fdc25e3f.tar.xz
systemd-027f96c8514bd179a0dee64d624cad18fdc25e3f.zip
udevadm: rename option '--log-priority' into '--log-level'
Let's be consistent with systemctl(1). '--log-priority' i still kept only for backward compatibility.
Diffstat (limited to 'src/udev/udevadm-control.c')
-rw-r--r--src/udev/udevadm-control.c9
1 files changed, 5 insertions, 4 deletions
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;