X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpb-discover.c;h=536f6e65a7b34a88a916417f553eb7414a5773f3;hp=aac50df332d4c47b636909ae7b7c0afbf3310c4a;hb=c25601a71b0951225691aa2edc389826f7f3836c;hpb=09cc1ef3d7e2c1dab6648aceb24dd33e7897f998

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index aac50df..536f6e6 100644
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -101,6 +101,7 @@ int main(int argc, char *argv[])
 {
 	struct device_handler *handler;
 	struct discover_server *server;
+	struct waitset *waitset;
 	struct opts opts;
 	struct udev *udev;
 	struct user_event *uev;
@@ -138,7 +139,9 @@ int main(int argc, char *argv[])
 
 	signal(SIGINT, sigint_handler);
 
-	server = discover_server_init();
+	waitset = waitset_create(NULL);
+
+	server = discover_server_init(waitset);
 	if (!server)
 		return EXIT_FAILURE;
 
@@ -148,11 +151,11 @@ int main(int argc, char *argv[])
 
 	discover_server_set_device_source(server, handler);
 
-	udev = udev_init(handler);
+	udev = udev_init(waitset, handler);
 	if (!udev)
 		return EXIT_FAILURE;
 
-	uev = user_event_init(handler);
+	uev = user_event_init(waitset, handler);
 	if (!uev)
 		return EXIT_FAILURE;
 
@@ -160,11 +163,12 @@ int main(int argc, char *argv[])
 	user_event_trigger(uev);
 
 	for (running = 1; running;) {
-		if (waiter_poll())
+		if (waiter_poll(waitset))
 			break;
 	}
 
 	device_handler_destroy(handler);
+	waitset_destroy(waitset);
 
 	pb_log("--- end ---\n");