libudev: queue - watch entire directory to allow the re-use of the watch descriptor

diff --git a/src/libudev/libudev-queue.c b/src/libudev/libudev-queue.c
index d4334b440dacd706cf3a4df0761b1aa12fdaa1d1..8ef1f3d4b05e0bac3515f8609dacd2f1807fa421 100644 (file)
--- a/src/libudev/libudev-queue.c
+++ b/src/libudev/libudev-queue.c
@@ -245,7 +245,7 @@ _public_ int udev_queue_get_fd(struct udev_queue *udev_queue) {
         if (fd < 0)
                 return -errno;
 
         if (fd < 0)
                 return -errno;
 

-        r = inotify_add_watch(fd, "/run/udev/queue" , IN_DELETE);
+        r = inotify_add_watch(fd, "/run/udev" , IN_DELETE);

         if (r < 0) {
                 r = -errno;
                 close(fd);
         if (r < 0) {
                 r = -errno;
                 close(fd);

diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
index 79e8b5990b65dfc65a8a71675ecd66b368766f47..fa5b0c2d2ed8119b85e3719a923de6f8c407e01b 100644 (file)
--- a/src/udev/udevadm-settle.c
+++ b/src/udev/udevadm-settle.c
@@ -135,7 +135,7 @@ static int adm_settle(struct udev *udev, int argc, char *argv[])
                 }
 
                 /* wake up when queue is empty */
                 }
 
                 /* wake up when queue is empty */

-                if (poll(pfd, 1, 100) > 0 && pfd[0].revents & POLLIN)
+                if (poll(pfd, 1, MSEC_PER_SEC) > 0 && pfd[0].revents & POLLIN)

                         udev_queue_flush(queue);
         }
 
                         udev_queue_flush(queue);
         }