]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
udevadm: merge two log stmts 25282/head
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 28 Oct 2022 14:00:13 +0000 (16:00 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 7 Nov 2022 12:22:09 +0000 (13:22 +0100)
src/udev/udevadm-settle.c

index f093b7cbe8acd099009774f6c8cf76afe78e0fe1..c236a7047a7cd060ce20d97ddf92923be531a04d 100644 (file)
@@ -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);