}
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);
talloc_free(device);
}
-void device_handler_boot_status(void *arg, struct boot_status *status)
+void device_handler_status(struct device_handler *handler,
+ struct status *status)
{
- struct device_handler *handler = arg;
-
discover_server_notify_boot_status(handler->server, status);
}
+static void _device_handler_vstatus(struct device_handler *handler,
+ enum status_type type, const char *fmt, va_list ap)
+{
+ struct status status;
+
+ status.type = type;
+ status.message = talloc_vasprintf(handler, fmt, ap);
+
+ device_handler_status(handler, &status);
+
+ talloc_free(status.message);
+}
+
+void device_handler_status_info(struct device_handler *handler,
+ const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ _device_handler_vstatus(handler, STATUS_INFO, fmt, ap);
+ va_end(ap);
+}
+
+void device_handler_status_err(struct device_handler *handler,
+ const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ _device_handler_vstatus(handler, STATUS_ERROR, fmt, ap);
+ va_end(ap);
+}
+
+static void device_handler_boot_status_cb(void *arg, struct status *status)
+{
+ device_handler_status(arg, status);
+}
+
static void countdown_status(struct device_handler *handler,
struct discover_boot_option *opt, unsigned int sec)
{
- struct boot_status status;
+ struct status status;
- status.type = BOOT_STATUS_INFO;
- status.progress = -1;
- status.detail = NULL;
+ status.type = STATUS_INFO;
status.message = talloc_asprintf(handler,
_("Booting in %d sec: %s"), sec, opt->option->name);
- discover_server_notify_boot_status(handler->server, &status);
+ device_handler_status(handler, &status);
talloc_free(status.message);
}
platform_pre_boot();
handler->pending_boot = boot(handler, handler->default_boot_option,
- NULL, handler->dry_run, device_handler_boot_status,
+ NULL, handler->dry_run, device_handler_boot_status_cb,
handler);
handler->pending_boot_is_default = true;
return 0;
struct discover_device *dev)
{
struct discover_context *ctx;
- struct boot_status *status;
int rc;
- status = talloc_zero(handler, struct boot_status);
- status->type = BOOT_STATUS_INFO;
/*
* TRANSLATORS: this string will be passed the type and identifier
* of the device. For example, the first parameter could be "Disk",
* (which will be translated accordingly) and the second a Linux device
* identifier like 'sda1' (which will not be translated)
*/
- status->message = talloc_asprintf(status, _("Processing %s device %s"),
+ device_handler_status_info(handler, _("Processing %s device %s"),
device_type_display_name(dev->device->type),
dev->device->id);
- device_handler_boot_status(handler, status);
process_boot_option_queue(handler);
* TRANSLATORS: the format specifier in this string is a Linux
* device identifier, like 'sda1'
*/
- status->message = talloc_asprintf(status,_("Processing %s complete"),
+ device_handler_status_info(handler, _("Processing %s complete"),
dev->device->id);
- device_handler_boot_status(handler, status);
- talloc_free(status);
talloc_unlink(handler, ctx);
return 0;
struct discover_device *dev, struct event *event)
{
struct discover_context *ctx;
- struct boot_status *status;
- status = talloc_zero(handler, struct boot_status);
- status->type = BOOT_STATUS_INFO;
/*
* TRANSLATORS: this format specifier will be the name of a network
* device, like 'eth0'.
*/
- status->message = talloc_asprintf(status, _("Processing dhcp event on %s"),
+ device_handler_status_info(handler, _("Processing dhcp event on %s"),
dev->device->id);
- device_handler_boot_status(handler, status);
/* create our context */
ctx = device_handler_discover_context_create(handler, dev);
* TRANSLATORS: this format specifier will be the name of a network
* device, like 'eth0'.
*/
- status->message = talloc_asprintf(status,_("Processing %s complete"),
+ device_handler_status_info(handler, _("Processing %s complete"),
dev->device->id);
- device_handler_boot_status(handler, status);
- talloc_free(status);
talloc_unlink(handler, ctx);
return 0;
platform_pre_boot();
handler->pending_boot = boot(handler, opt, cmd, handler->dry_run,
- device_handler_boot_status, handler);
+ device_handler_boot_status_cb, handler);
handler->pending_boot_is_default = false;
}
void device_handler_cancel_default(struct device_handler *handler)
{
- struct boot_status status;
-
if (handler->timeout_waiter)
waiter_remove(handler->timeout_waiter);
handler->default_boot_option = NULL;
- status.type = BOOT_STATUS_INFO;
- status.progress = -1;
- status.detail = NULL;
- status.message = _("Default boot cancelled");
-
- discover_server_notify_boot_status(handler->server, &status);
+ device_handler_status_info(handler, _("Default boot cancelled"));
}
void device_handler_update_config(struct device_handler *handler,
{
struct discover_context *ctx;
struct discover_device *dev;
- struct boot_status *status;
struct pb_url *pb_url;
struct event *event;
struct param *param;
- status = talloc(handler, struct boot_status);
-
- status->type = BOOT_STATUS_ERROR;
- status->progress = 0;
- status->detail = talloc_asprintf(status,
- _("Received config URL %s"), url);
-
if (!handler->network) {
- status->message = talloc_asprintf(handler,
- _("No network configured"));
- goto msg;
+ device_handler_status_err(handler, _("No network configured"));
+ return;
}
event = talloc(handler, struct event);
pb_url = pb_url_parse(event, event->params->value);
if (!pb_url || (pb_url->scheme != pb_url_file && !pb_url->host)) {
- status->message = talloc_asprintf(handler,
- _("Invalid config URL!"));
- goto msg;
+ device_handler_status_err(handler, _("Invalid config URL!"));
+ return;
}
if (pb_url->scheme == pb_url_file)
event->device = device_from_addr(event, pb_url);
if (!event->device) {
- status->message = talloc_asprintf(status,
+ device_handler_status_err(handler,
_("Unable to route to host %s"),
pb_url->host);
- goto msg;
+ return;
}
- 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);
device_handler_discover_context_commit(handler, ctx);
talloc_unlink(handler, ctx);
-
- status->type = BOOT_STATUS_INFO;
- status->message = talloc_asprintf(status, _("Config file %s parsed"),
- pb_url->file);
-msg:
- device_handler_boot_status(handler, status);
- talloc_free(status);
}
#ifndef PETITBOOT_TEST
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 */
projects / petitboot / blobdiff