X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fudev.c;h=f9eb26d078213a9a323d74ff4e7447ca652a75bf;hb=e52b37c27c267c882d82cd1e34412817b5a4dbce;hp=7fc5595f9b72f17dfac18d48ef9987c0fd96c03c;hpb=dc77d447920c6af88009ceea8b23a2172701d32b;p=petitboot

diff --git a/discover/udev.c b/discover/udev.c
index 7fc5595..f9eb26d 100644
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -59,16 +59,9 @@ static void udev_setup_event_params(struct udev_device *dev,
 	if (!list)
 		return;
 
-	udev_list_entry_foreach(entry, list) {
-		DBG("property: %s - %s\n",
-			udev_list_entry_get_name(entry),
-			udev_device_get_property_value(dev,
-				udev_list_entry_get_name(entry)));
-
+	udev_list_entry_foreach(entry, list)
 		event_set_param(event,udev_list_entry_get_name(entry),
 				udev_list_entry_get_value(entry));
-
-	}
 }
 
 static int udev_handle_dev_action(struct udev_device *dev, const char *action)
@@ -128,11 +121,13 @@ static int udev_handle_dev_action(struct udev_device *dev, const char *action)
 
 	event->type = EVENT_TYPE_UDEV;
 	event->action = eva;
-	event->device = devpath;
+	event->device = devnode;
 
 	event->n_params = 0;
 	event->params = NULL;
-	event_set_param(event, "DEVNAME", devnode);
+	event_set_param(event, "path", devpath);
+	event_set_param(event, "node", devnode);
+	event_set_param(event, "type", devtype);
 
 	udev_setup_event_params(dev, event);
 
@@ -303,7 +298,7 @@ struct pb_udev *udev_init(struct waitset *waitset,
 	if (result)
 		goto fail_monitor;
 
-	waiter_register(waitset, udev_monitor_get_fd(udev->monitor), WAIT_IN,
+	waiter_register_io(waitset, udev_monitor_get_fd(udev->monitor), WAIT_IN,
 		udev_process, udev->monitor);
 
 	pb_log("%s: waiting on udev\n", __func__);