discover: Consolidate device path, name and ID.

[petitboot] / discover / udev.c

diff --git a/discover/udev.c b/discover/udev.c
index 1ce623d17c6c61a8a1e7e2891af2adc89a799d42..f9eb26d078213a9a323d74ff4e7447ca652a75bf 100644 (file)
--- 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)
@@ -132,7 +125,9 @@ static int udev_handle_dev_action(struct udev_device *dev, const char *action)
 
        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__);