aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcus Folkesson <marcus.folkesson@gmail.com>2017-11-28 11:48:51 +0100
committerAnthony G. Basile <blueness@gentoo.org>2017-11-29 06:21:11 -0500
commitb1e47be38259f33e1db18193904575a1ffa21be8 (patch)
tree2b23f7b583e95f052d54ee2e6cf67bbf967f47ad /src
parentudevd.c: event-timout options requires an argument (diff)
downloadeudev-b1e47be38259f33e1db18193904575a1ffa21be8.tar.gz
eudev-b1e47be38259f33e1db18193904575a1ffa21be8.tar.bz2
eudev-b1e47be38259f33e1db18193904575a1ffa21be8.zip
libudev-monitor.c: fail to monitor udev if udev is not started
We makes two controls if we consider udev is started; access(UDEV_ROOT_RUN "/udev/control", F_OK) < 0 and !udev_has_devtmpfs(udev)) If one(not both) of these statements fails, we consider that udev is not running. Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com> Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'src')
-rw-r--r--src/libudev/libudev-monitor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c
index fe494a4a7..614149c62 100644
--- a/src/libudev/libudev-monitor.c
+++ b/src/libudev/libudev-monitor.c
@@ -186,7 +186,7 @@ struct udev_monitor *udev_monitor_new_from_netlink_fd(struct udev *udev, const c
* We do not set a netlink multicast group here, so the socket
* will not receive any messages.
*/
- if (access(UDEV_ROOT_RUN "/udev/control", F_OK) < 0 && !udev_has_devtmpfs(udev)) {
+ if (access(UDEV_ROOT_RUN "/udev/control", F_OK) < 0 || !udev_has_devtmpfs(udev)) {
log_debug("the udev service seems not to be active, disable the monitor");
group = UDEV_MONITOR_NONE;
} else