From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 27 Aug 2022 15:45:21 +0000 (+0900)
Subject: udevadm-settle: check if udevd is running
X-Git-Tag: v252-rc1~295^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=23b11e0b7ce3ece40606edeed43ff998c3fe03ee;p=thirdparty%2Fsystemd.git

udevadm-settle: check if udevd is running
---

diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
index 50972847f25..1bb047f4422 100644
--- a/src/udev/udevadm-settle.c
+++ b/src/udev/udevadm-settle.c
@@ -194,6 +194,10 @@ int settle_main(int argc, char *argv[], void *userdata) {
                 r = udev_ctrl_wait(uctrl, MAX(5 * USEC_PER_SEC, arg_timeout));
                 if (r < 0)
                         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.");
         }
 
         fd = udev_queue_init();