X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=70e4506c487ace8e7d7ce2b2354296dd82bbe79a;hp=682a4e9ae865944d4acea0c62c5b9418ffe36227;hb=662129afba2d344d692a9dbfd430c91eff4f281d;hpb=7e6dd06b20beda18d07ce725e4d8c4473d10d902 diff --git a/discover/device-handler.c b/discover/device-handler.c index 682a4e9..70e4506 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -221,17 +221,22 @@ static int destroy_device(void *arg) } struct discover_device *discover_device_create(struct device_handler *handler, - const char *id) + const char *uuid, const char *id) { struct discover_device *dev; - dev = device_lookup_by_id(handler, id); + if (uuid) + dev = device_lookup_by_uuid(handler, uuid); + else + dev = device_lookup_by_id(handler, id); + if (dev) return dev; dev = talloc_zero(handler, struct discover_device); dev->device = talloc_zero(dev, struct device); dev->device->id = talloc_strdup(dev->device, id); + dev->uuid = talloc_strdup(dev, uuid); list_init(&dev->params); list_init(&dev->boot_options); @@ -613,6 +618,7 @@ static bool __attribute__((used)) boot_option_is_resolved( return resource_is_resolved(opt->boot_image) && resource_is_resolved(opt->initrd) && resource_is_resolved(opt->dtb) && + resource_is_resolved(opt->args_sig_file) && resource_is_resolved(opt->icon); } @@ -638,6 +644,8 @@ static bool boot_option_resolve(struct discover_boot_option *opt, return resource_resolve(opt->boot_image, "boot_image", opt, handler) && resource_resolve(opt->initrd, "initrd", opt, handler) && resource_resolve(opt->dtb, "dtb", opt, handler) && + resource_resolve(opt->args_sig_file, "args_sig_file", opt, + handler) && resource_resolve(opt->icon, "icon", opt, handler); } @@ -652,6 +660,7 @@ static void boot_option_finalise(struct device_handler *handler, assert(!opt->option->dtb_file); assert(!opt->option->icon_file); assert(!opt->option->device_id); + assert(!opt->option->args_sig_file); if (opt->boot_image) opt->option->boot_image_file = opt->boot_image->url->full; @@ -661,6 +670,8 @@ static void boot_option_finalise(struct device_handler *handler, opt->option->dtb_file = opt->dtb->url->full; if (opt->icon) opt->option->icon_file = opt->icon->url->full; + if (opt->args_sig_file) + opt->option->args_sig_file = opt->args_sig_file->url->full; opt->option->device_id = opt->device->device->id; @@ -894,6 +905,7 @@ int device_handler_dhcp(struct device_handler *handler, /* create our context */ ctx = device_handler_discover_context_create(handler, dev); + talloc_steal(ctx, event); ctx->event = event; iterate_parsers(ctx); @@ -914,36 +926,6 @@ int device_handler_dhcp(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; - struct boot_status *status; - - status = talloc_zero(handler, struct boot_status); - status->type = BOOT_STATUS_INFO; - status->message = talloc_asprintf(status, _("Processing user config")); - device_handler_boot_status(handler, status); - - /* 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); - - status->message = talloc_asprintf(status, - _("Processing user config complete")); - device_handler_boot_status(handler, status); - - talloc_free(status); - talloc_unlink(handler, ctx); - - return 0; -} - static struct discover_boot_option *find_boot_option_by_id( struct device_handler *handler, const char *id) { @@ -1120,7 +1102,7 @@ void device_handler_process_url(struct device_handler *handler, event = talloc(handler, struct event); event->type = EVENT_TYPE_USER; - event->action = EVENT_ACTION_CONF; + event->action = EVENT_ACTION_URL; if (url[strlen(url) - 1] == '/') { event->params = talloc_array(event, struct param, 3); @@ -1161,10 +1143,11 @@ void device_handler_process_url(struct device_handler *handler, goto msg; } - dev = discover_device_create(handler, event->device); + dev = discover_device_create(handler, mac, event->device); if (pb_url->scheme == pb_url_file) dev->device->type = DEVICE_TYPE_ANY; ctx = device_handler_discover_context_create(handler, dev); + talloc_steal(ctx, event); ctx->event = event; iterate_parsers(ctx); @@ -1193,7 +1176,7 @@ void device_handler_discover_context_commit(struct device_handler *handler, struct discover_device *dev = ctx->device; struct discover_boot_option *opt, *tmp; - if (!device_lookup_by_id(handler, dev->device->id)) + if (!device_lookup_by_uuid(handler, dev->uuid)) device_handler_add_device(handler, dev); /* move boot options from the context to the device */ @@ -1581,6 +1564,41 @@ void device_release_write(struct discover_device *dev, bool release) dev->mounted = true; } +void device_sync_snapshots(struct device_handler *handler, const char *device) +{ + struct discover_device *dev = NULL; + unsigned int i; + + if (device) { + /* Find matching device and sync */ + dev = device_lookup_by_name(handler, device); + if (!dev) { + pb_log("%s: device name '%s' unrecognised\n", + __func__, device); + return; + } + if (dev->ramdisk) + device_release_write(dev, true); + else + pb_log("%s has no snapshot to merge, skipping\n", + dev->device->id); + return; + } + + /* Otherwise sync all relevant devices */ + for (i = 0; i < handler->n_devices; i++) { + dev = handler->devices[i]; + if (dev->device->type != DEVICE_TYPE_DISK && + dev->device->type != DEVICE_TYPE_USB) + continue; + if (dev->ramdisk) + device_release_write(dev, true); + else + pb_log("%s has no snapshot to merge, skipping\n", + dev->device->id); + } +} + #else void device_handler_discover_context_commit( @@ -1628,4 +1646,10 @@ void device_release_write(struct discover_device *dev __attribute__((unused)), { } +void device_sync_snapshots( + struct device_handler *handler __attribute__((unused)), + const char *device __attribute__((unused))) +{ +} + #endif