libudev: queue - always rebuild queue file when nothing is queued anymore

[elogind.git] / udev / udevadm-settle.c

diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c
index afd4af5f4b06617676f3bc8f4b8aed9d19ffb2de..b717ae60de1a663fe745dd84e229c8ac2f769c25 100644 (file)
--- a/udev/udevadm-settle.c
+++ b/udev/udevadm-settle.c
@@ -52,7 +52,7 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
        unsigned long long end = 0;
        int quiet = 0;
        const char *exists = NULL;
-       unsigned int timeout = 180;
+       unsigned int timeout = 120;
        struct pollfd pfd[1];
        struct udev_queue *udev_queue = NULL;
        int rc = EXIT_FAILURE;
@@ -153,7 +153,7 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
        if (pfd[0].fd < 0) {
                err(udev, "inotify_init failed: %m\n");
        } else {
-               if (inotify_add_watch(pfd[0].fd, udev_get_run_path(udev), IN_CLOSE_WRITE) < 0) {
+               if (inotify_add_watch(pfd[0].fd, udev_get_run_path(udev), IN_MOVED_TO) < 0) {
                        err(udev, "watching '%s' failed\n", udev_get_run_path(udev));
                        close(pfd[0].fd);
                        pfd[0].fd = -1;