X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fudev.c;h=40b9f638c5b9d51b0c2c432cbe4a223e1873dd96;hp=fb64221dad1d90036db782a3a1762f441e27e45c;hb=e0040f05dd45c84214bfdef5d4c6eacf9586aa7b;hpb=c13f929a197641ec0322fff57b4beeacb5338380

diff --git a/discover/udev.c b/discover/udev.c
index fb64221..40b9f63 100644
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -116,7 +116,7 @@ static int udev_destructor(void *p)
 	return 0;
 }
 
-struct udev *udev_init(struct device_handler *handler)
+struct udev *udev_init(struct waitset *waitset, struct device_handler *handler)
 {
 	struct sockaddr_un addr;
 	struct udev *udev;
@@ -144,7 +144,7 @@ struct udev *udev_init(struct device_handler *handler)
 		goto out_err;
 	}
 
-	waiter_register(udev->socket, WAIT_IN, udev_process, udev);
+	waiter_register(waitset, udev->socket, WAIT_IN, udev_process, udev);
 
 	pb_log("%s: waiting on %s\n", __func__, PBOOT_DEVICE_SOCKET);
 
@@ -158,7 +158,7 @@ out_err:
 int udev_trigger(struct udev __attribute__((unused)) *udev)
 {
 	const char *cmd[] = {
-		"/sbin/udevadm,
+		pb_system_apps.udevadm,
 		"trigger",
 		"--subsystem-match=block",
 		"--action=add",