X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=f1845a9479f4de878bfab4f5d6dcecbfcb1e69b1;hp=a497147918d43232498d23eeb833b4101d1ec6c0;hb=f7ace4cc96390a26b0f6c5ee4ff8fe6d7d62ecd0;hpb=1cb9c56d6453bca28cacb5ab3fc134bb151fd6f0 diff --git a/discover/device-handler.c b/discover/device-handler.c index a497147..f1845a9 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -1,4 +1,3 @@ - #include #include #include @@ -9,7 +8,6 @@ #include #include -#include #include #include #include @@ -20,10 +18,12 @@ #include "device-handler.h" #include "discover-server.h" +#include "platform.h" #include "event.h" #include "parser.h" #include "resource.h" #include "paths.h" +#include "sysinfo.h" #include "boot.h" struct device_handler { @@ -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; } @@ -279,6 +279,7 @@ struct device_handler *device_handler_init(struct discover_server *server, void device_handler_remove(struct device_handler *handler, struct discover_device *device) { + struct discover_boot_option *opt, *tmp; unsigned int i; for (i = 0; i < handler->n_devices; i++) @@ -290,6 +291,16 @@ void device_handler_remove(struct device_handler *handler, return; } + /* Free any unresolved options, as they're currently allocated + * against the handler */ + list_for_each_entry_safe(&handler->unresolved_boot_options, + opt, tmp, list) { + if (opt->device != device) + continue; + list_remove(&opt->list); + talloc_free(opt); + } + handler->n_devices--; memmove(&handler->devices[i], &handler->devices[i + 1], (handler->n_devices - i) * sizeof(handler->devices[0])); @@ -361,42 +372,51 @@ 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) { const struct config *config; struct boot_priority *prio; - int i; + unsigned int i; config = config_get(); for (i = 0; i < config->n_boot_priorities; i++) { prio = &config->boot_priorities[i]; if (priority_match(prio, opt)) - break; + return prio->priority; } - return i; + return 0; } static void set_default(struct device_handler *handler, struct discover_boot_option *opt) { + int new_prio; + if (!handler->autoboot_enabled) return; + new_prio = default_option_priority(opt); + + /* A negative priority indicates that we don't want to boot this device + * by default */ + if (new_prio < 0) + return; + /* Resolve any conflicts: if we have a new default option, it only * replaces the current if it has a higher priority. */ if (handler->default_boot_option) { - int new_prio, cur_prio; + int cur_prio; - new_prio = default_option_priority(opt); cur_prio = default_option_priority( handler->default_boot_option); - if (new_prio < cur_prio) { + if (new_prio > cur_prio) { handler->default_boot_option = opt; /* extend the timeout a little, so the user sees some * indication of the change */ @@ -589,7 +609,7 @@ void device_handler_add_device(struct device_handler *handler, * array, but has only just been initialised by the hotplug source. */ int device_handler_discover(struct device_handler *handler, - struct discover_device *dev, enum conf_method method) + struct discover_device *dev) { struct discover_context *ctx; int rc; @@ -603,8 +623,12 @@ int device_handler_discover(struct device_handler *handler, if (rc) goto out; + /* add this device to our system info */ + system_info_register_blockdev(dev->device->id, dev->uuid, + dev->mount_path); + /* run the parsers. This will populate the ctx's boot_option list. */ - iterate_parsers(ctx, method); + iterate_parsers(ctx); /* add discovered stuff to the handler */ device_handler_discover_context_commit(handler, ctx); @@ -615,18 +639,17 @@ out: return 0; } -/* incoming conf event */ -int device_handler_conf(struct device_handler *handler, - struct discover_device *dev, struct pb_url *url, - enum conf_method method) +/* Incoming dhcp event */ +int device_handler_dhcp(struct device_handler *handler, + struct discover_device *dev, struct event *event) { struct discover_context *ctx; /* create our context */ ctx = device_handler_discover_context_create(handler, dev); - ctx->conf_url = url; + ctx->event = event; - iterate_parsers(ctx, method); + iterate_parsers(ctx); device_handler_discover_context_commit(handler, ctx); @@ -635,6 +658,25 @@ int device_handler_conf(struct device_handler *handler, return 0; } +/* incoming conf event */ +int device_handler_conf(struct device_handler *handler, + struct discover_device *dev, struct pb_url *url) +{ + struct discover_context *ctx; + + /* create our context */ + ctx = device_handler_discover_context_create(handler, dev); + ctx->conf_url = url; + + iterate_parsers(ctx); + + device_handler_discover_context_commit(handler, ctx); + + talloc_free(ctx); + + return 0; +} + static struct discover_boot_option *find_boot_option_by_id( struct device_handler *handler, const char *id) { @@ -699,6 +741,13 @@ void device_handler_cancel_default(struct device_handler *handler) discover_server_notify_boot_status(handler->server, &status); } +void device_handler_update_config(struct device_handler *handler, + struct config *config) +{ + config_set(config); + discover_server_notify_config(handler->server, config); +} + #ifndef PETITBOOT_TEST static bool check_existing_mount(struct discover_device *dev) {