discover: populate udev device types

[petitboot] / discover / udev.c

diff --git a/discover/udev.c b/discover/udev.c
index 525e4a93649f7ec215a26f04f6b86fac62b03b12..d13ced7a22d175cf9684511d41e7ba52289d6020 100644 (file)
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -50,23 +50,18 @@ static int udev_destructor(void *p)
        return 0;
 }
 
-static void print_device_properties(struct udev_device *dev)
+static void udev_setup_event_params(struct udev_device *dev,
+               struct event *event)
 {
        struct udev_list_entry *list, *entry;
 
-       assert(dev);
-
-       if (1) {
-               list = udev_device_get_properties_list_entry(dev);
-
-               assert(list);
+       list = udev_device_get_properties_list_entry(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)
@@ -102,8 +97,6 @@ static int udev_handle_dev_action(struct udev_device *dev, const char *action)
                return -1;
        }
 
-       print_device_properties(dev);
-
        /* Ignore non disk or partition, ram, loop. */
 
        if (!(strstr(devtype, "disk") || strstr(devtype, "partition"))
@@ -128,12 +121,14 @@ 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, "type", devtype);
 
-       event->n_params = 1;
-       event->params = talloc(event, struct param);
-       event->params->name = "DEVNAME";
-       event->params->value = devnode;
+       udev_setup_event_params(dev, event);
 
        udev = udev_get_userdata(udev_device_get_udev(dev));
        assert(udev);
@@ -302,10 +297,10 @@ 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 %s\n", __func__, udev_get_sys_path(udev->udev));
+       pb_log("%s: waiting on udev\n", __func__);
 
        return udev;