From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 31 Aug 2022 15:09:28 +0000 (+0900)
Subject: udevadm-settle: improve logs when we cannot access /run/udev/control
X-Git-Tag: v252-rc1~284
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=133ac84e60a9cd29cf0c682d6c05d88a56511b8d;p=thirdparty%2Fsystemd.git

udevadm-settle: improve logs when we cannot access /run/udev/control

Addresses https://github.com/systemd/systemd/pull/24474#discussion_r959696663.
---

diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
index 9de25ae6780..f093b7cbe8a 100644
--- a/src/udev/udevadm-settle.c
+++ b/src/udev/udevadm-settle.c
@@ -217,8 +217,11 @@ 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)
-                        return log_error_errno(errno, "udevd is not 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");
+                }
         }
 
         r = sd_event_default(&event);