discover/udev: use devname (not devpath) for device IDs

[petitboot] / discover / udev.c

diff --git a/discover/udev.c b/discover/udev.c
index c81183f742db260bd8310285b32677ca3e271860..1ce623d17c6c61a8a1e7e2891af2adc89a799d42 100644 (file)
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -50,22 +50,24 @@ 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);
+       list = udev_device_get_properties_list_entry(dev);
+       if (!list)
+               return;
 
-       if (1) {
-               list = udev_device_get_properties_list_entry(dev);
+       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)));
 
-               assert(list);
+               event_set_param(event,udev_list_entry_get_name(entry),
+                               udev_list_entry_get_value(entry));
 
-               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)));
        }
 }
 
@@ -102,8 +104,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 +128,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->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);