X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=f1845a9479f4de878bfab4f5d6dcecbfcb1e69b1;hp=a2713904f01f4f85e30547c5a63ff643b0e46bf6;hb=f7ace4cc96390a26b0f6c5ee4ff8fe6d7d62ecd0;hpb=aa530148044a7c6d7ec7b6a32672cc69d53979b2 diff --git a/discover/device-handler.c b/discover/device-handler.c index a271390..f1845a9 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -250,7 +250,7 @@ const char *discover_device_get_param(struct discover_device *device, list_for_each_entry(&device->params, param, list) { if (!strcmp(param->name, name)) - return param->name; + return param->value; } return NULL; } @@ -372,7 +372,8 @@ static int default_timeout(void *arg) static bool priority_match(struct boot_priority *prio, struct discover_boot_option *opt) { - return prio->type == opt->device->device->type; + return prio->type == opt->device->device->type || + prio->type == DEVICE_TYPE_ANY; } static int default_option_priority(struct discover_boot_option *opt)