X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudevadm-settle.c;h=b17ba806d00a7ec33b79f002adcd91ec7d593cff;hb=7236c6c40a730d053141d9fe797dc65dc2ecd1f1;hp=afd4af5f4b06617676f3bc8f4b8aed9d19ffb2de;hpb=ead7c62ab7641e150c6d668f939c102a6771ce60;p=elogind.git

diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c
index afd4af5f4..b17ba806d 100644
--- 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;
@@ -183,8 +183,14 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
 		}
 
 		if (pfd[0].fd >= 0) {
-			/* wake up once every second, or whenever the queue file gets gets closed */
-			if (poll(pfd, 1, 1000) > 0 && pfd[0].revents & POLLIN) {
+			int delay;
+
+			if (exists != NULL || start > 0)
+				delay = 100;
+			else
+				delay = 1000;
+			/* wake up after delay, or immediately after the queue is rebuilt */
+			if (poll(pfd, 1, delay) > 0 && pfd[0].revents & POLLIN) {
 				char buf[sizeof(struct inotify_event) + PATH_MAX];
 
 				read(pfd[0].fd, buf, sizeof(buf));