shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-06 13:17:44 +03:00
Code

udevadm-settle: fixed return code for empty queue

Browse Source 
If the udev queue is empty and "/run/udev/queue" does not exist,
"udevadm settle" would return with EXIT_FAILURE, because the inotify on
"/run/udev/queue" would fail with ENOENT.

This patch lets "udevadm settle" exit with EXIT_SUCCESS in this case.
This commit is contained in:
Harald Hoyer 2014-05-20 12:25:16 +02:00
parent 8477107dec
commit 83be2c3985
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/udev/udevadm-settle.c
View File

@ -116,7 +116,11 @@ static int adm_settle(struct udev *udev, int argc, char *argv[])
}
if (inotify_add_watch(pfd[0].fd, "/run/udev/queue" , IN_DELETE) < 0) {
log_debug("watching /run/udev failed");
/* If it does not exist, we don't have to wait */
if (errno == ENOENT)
rc = EXIT_SUCCESS;
else
log_debug("watching /run/udev/queue failed");
goto out;
}