summaryrefslogtreecommitdiff
path: root/src/udev/udevadm-settle.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-10-28 16:00:13 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-11-07 13:22:09 +0100
commitdb12cf926faa7eabb6ed988b2e6056713018259a (patch)
tree66dfeca264ea71716da0dc04e179698955ab585c /src/udev/udevadm-settle.c
parent195427cd187864f9bd1736df837631366ac5067e (diff)
downloadsystemd-db12cf926faa7eabb6ed988b2e6056713018259a.tar.gz
udevadm: merge two log stmts
Diffstat (limited to 'src/udev/udevadm-settle.c')
-rw-r--r--src/udev/udevadm-settle.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
index f093b7cbe8..c236a7047a 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);