X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fudev.c;h=309a749acfbad20787e703f256216be11f017d08;hp=7fc5595f9b72f17dfac18d48ef9987c0fd96c03c;hb=93dc538ce05cede3293477d5dded057682b9cc92;hpb=dc77d447920c6af88009ceea8b23a2172701d32b diff --git a/discover/udev.c b/discover/udev.c index 7fc5595..309a749 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,7 +121,7 @@ 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; @@ -303,7 +296,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__);