From db12cf926faa7eabb6ed988b2e6056713018259a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 28 Oct 2022 16:00:13 +0200 Subject: [PATCH] udevadm: merge two log stmts --- src/udev/udevadm-settle.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c index f093b7cbe8a..c236a7047a7 100644 --- a/src/udev/udevadm-settle.c +++ b/src/udev/udevadm-settle.c @@ -217,11 +217,10 @@ int settle_main(int argc, char *argv[], void *userdata) { return log_error_errno(r, "Failed to wait for daemon to reply: %m"); } else { /* For non-privileged users, at least check if udevd is running. */ - if (access("/run/udev/control", F_OK) < 0) { - if (errno == ENOENT) - return log_error_errno(errno, "systemd-udevd is not running."); - return log_error_errno(errno, "Failed to check if /run/udev/control exists: %m"); - } + if (access("/run/udev/control", F_OK) < 0) + return log_error_errno(errno, + errno == ENOENT ? "systemd-udevd is not running." : + "Failed to check if /run/udev/control exists: %m"); } r = sd_event_default(&event); -- 2.47.3