On 20.05.2014 12:33, [email protected] wrote: > From: Harald Hoyer <[email protected]> > > 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. > --- > src/udev/udevadm-settle.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c > index 65fc35f..66fd843 100644 > --- a/src/udev/udevadm-settle.c > +++ b/src/udev/udevadm-settle.c > @@ -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; > } > >
and pushed _______________________________________________ systemd-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/systemd-devel
