X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudevadm-settle.c;h=9f409b61b80ea5f941330d08f7ecf12717a03a22;hb=d800e8688a34bc848977999ce77fb40cba17df9e;hp=9492abd401e0dbb8f9efd193ac383d045139ac29;hpb=d2f4a3464dacf56f50c3ab4fa42353efd33ce22b;p=elogind.git

diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c
index 9492abd40..9f409b61b 100644
--- a/udev/udevadm-settle.c
+++ b/udev/udevadm-settle.c
@@ -36,7 +36,7 @@
 
 #include "udev.h"
 
-int udevadm_settle(struct udev *udev, int argc, char *argv[])
+static int adm_settle(struct udev *udev, int argc, char *argv[])
 {
 	static const struct option options[] = {
 		{ "seq-start", required_argument, NULL, 's' },
@@ -96,7 +96,9 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
 			       "  --exit-if-exists=<file> stop waiting if file exists\n"
 			       "  --quiet                 do not print list after timeout\n"
 			       "  --help\n\n");
-			exit(0);
+			exit(EXIT_SUCCESS);
+		default:
+			exit(EXIT_FAILURE);
 		}
 	}
 
@@ -153,7 +155,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 +185,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));
@@ -219,3 +227,9 @@ out:
 	udev_queue_unref(udev_queue);
 	return rc;
 }
+
+const struct udevadm_cmd udevadm_settle = {
+	.name = "settle",
+	.cmd = adm_settle,
+	.help = "wait for the event queue to finish",
+};