X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=ee99f2166da870e6fbb1e368b1a1b9311af611b6;hp=3a687675c3bde9c0af445634dbf25a3ff91fcab0;hb=4466139b7bf4573b6b85555bb1ff7e31fbaaa934;hpb=a5db3ced87f5f24500f785b70af8b8630bc1c077 diff --git a/discover/device-handler.c b/discover/device-handler.c index 3a68767..ee99f21 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include @@ -30,6 +31,12 @@ struct device_handler { struct discover_device **devices; unsigned int n_devices; + struct waitset *waitset; + struct waiter *timeout_waiter; + bool autoboot_enabled; + unsigned int sec_to_boot; + + struct discover_boot_option *default_boot_option; struct list unresolved_boot_options; }; @@ -176,6 +183,7 @@ void device_handler_destroy(struct device_handler *handler) * to keep struct device_handler opaque. */ struct device_handler *device_handler_init( struct discover_server *server __attribute__((unused)), + struct waitset *waitset __attribute__((unused)), int dry_run __attribute__((unused))) { struct device_handler *handler; @@ -274,7 +282,7 @@ static int umount_device(struct discover_device *dev) } struct device_handler *device_handler_init(struct discover_server *server, - int dry_run) + struct waitset *waitset, int dry_run) { struct device_handler *handler; @@ -282,7 +290,10 @@ struct device_handler *device_handler_init(struct discover_server *server, handler->devices = NULL; handler->n_devices = 0; handler->server = server; + handler->waitset = waitset; handler->dry_run = dry_run; + handler->default_boot_option = NULL; + handler->autoboot_enabled = config_get()->autoboot_enabled; list_init(&handler->unresolved_boot_options); /* set up our mount point base */ @@ -373,6 +384,71 @@ static void device_handler_remove(struct device_handler *handler, talloc_free(device); } +static void boot_status(void *arg, struct boot_status *status) +{ + struct device_handler *handler = arg; + + discover_server_notify_boot_status(handler->server, status); +} + +static void countdown_status(struct device_handler *handler, + struct discover_boot_option *opt, unsigned int sec) +{ + struct boot_status status; + + status.type = BOOT_STATUS_INFO; + status.progress = -1; + status.detail = NULL; + status.message = talloc_asprintf(handler, + "Booting %s in %d sec", opt->option->name, sec); + + discover_server_notify_boot_status(handler->server, &status); + + talloc_free(status.message); +} + +static int default_timeout(void *arg) +{ + struct device_handler *handler = arg; + struct discover_boot_option *opt; + + if (!handler->default_boot_option) + return 0; + + opt = handler->default_boot_option; + + if (handler->sec_to_boot) { + countdown_status(handler, opt, handler->sec_to_boot); + handler->sec_to_boot--; + handler->timeout_waiter = waiter_register_timeout( + handler->waitset, 1000, + default_timeout, handler); + return 0; + } + + pb_log("Timeout expired, booting default option %s\n", opt->option->id); + + boot(handler, handler->default_boot_option, NULL, + handler->dry_run, boot_status, handler); + return 0; +} + +static void set_default(struct device_handler *handler, + struct discover_boot_option *opt) +{ + if (handler->default_boot_option) + return; + + if (!handler->autoboot_enabled) + return; + + pb_log("Boot option %s set as default\n", opt->option->id); + + handler->default_boot_option = opt; + handler->sec_to_boot = DEFAULT_BOOT_TIMEOUT_SEC; + default_timeout(handler); +} + static bool resource_is_resolved(struct resource *res) { return !res || res->resolved; @@ -385,6 +461,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->icon); } @@ -409,16 +486,19 @@ 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->icon, "icon", opt, handler); } -static void boot_option_finalise(struct discover_boot_option *opt) +static void boot_option_finalise(struct device_handler *handler, + struct discover_boot_option *opt) { assert(boot_option_is_resolved(opt)); /* check that the parsers haven't set any of the final data */ assert(!opt->option->boot_image_file); assert(!opt->option->initrd_file); + assert(!opt->option->dtb_file); assert(!opt->option->icon_file); assert(!opt->option->device_id); @@ -426,10 +506,15 @@ static void boot_option_finalise(struct discover_boot_option *opt) opt->option->boot_image_file = opt->boot_image->url->full; if (opt->initrd) opt->option->initrd_file = opt->initrd->url->full; + if (opt->dtb) + opt->option->dtb_file = opt->dtb->url->full; if (opt->icon) opt->option->icon_file = opt->icon->url->full; opt->option->device_id = opt->device->device->id; + + if (opt->option->is_default) + set_default(handler, opt); } static void process_boot_option_queue(struct device_handler *handler) @@ -448,9 +533,9 @@ static void process_boot_option_queue(struct device_handler *handler) pb_log("\tresolved!\n"); list_remove(&opt->list); - list_add(&opt->device->boot_options, &opt->list); + list_add_tail(&opt->device->boot_options, &opt->list); talloc_steal(opt->device, opt); - boot_option_finalise(opt); + boot_option_finalise(handler, opt); discover_server_notify_boot_option_add(handler->server, opt->option); } @@ -500,9 +585,9 @@ static void context_commit(struct device_handler *handler, pb_log("boot option %s is resolved, " "sending to clients\n", opt->option->id); - list_add(&dev->boot_options, &opt->list); + list_add_tail(&dev->boot_options, &opt->list); talloc_steal(dev, opt); - boot_option_finalise(opt); + boot_option_finalise(handler, opt); discover_server_notify_boot_option_add(handler->server, opt->option); } else { @@ -704,13 +789,6 @@ int device_handler_event(struct device_handler *handler, return handlers[event->type][event->action](handler, event); } -static void boot_status(void *arg, struct boot_status *status) -{ - struct device_handler *handler = arg; - - discover_server_notify_boot_status(handler->server, status); -} - static struct discover_boot_option *find_boot_option_by_id( struct device_handler *handler, const char *id) { @@ -737,4 +815,30 @@ void device_handler_boot(struct device_handler *handler, boot(handler, opt, cmd, handler->dry_run, boot_status, handler); } + +void device_handler_cancel_default(struct device_handler *handler) +{ + struct boot_status status; + + if (handler->timeout_waiter) + waiter_remove(handler->timeout_waiter); + + handler->timeout_waiter = NULL; + handler->autoboot_enabled = false; + + /* we only send status if we had a default boot option queued */ + if (!handler->default_boot_option) + return; + + pb_log("Cancelling default boot option\n"); + + 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); +} #endif