X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=d2a3f16757ed9433baaee15d207667190ea33634;hp=f1632f0fe10989a5b48668920fc58473e7a46108;hb=72332700113065602e3545b7a358a34c102851d8;hpb=01f60e05ef83e3b91f7084ed95e6cc07412c8bb9

diff --git a/discover/device-handler.c b/discover/device-handler.c
index f1632f0..d2a3f16 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -32,6 +32,8 @@ struct device_handler {
 
 	struct waitset		*waitset;
 	struct waiter		*timeout_waiter;
+	bool			default_enabled;
+	unsigned int		sec_to_boot;
 
 	struct discover_boot_option *default_boot_option;
 	struct list		unresolved_boot_options;
@@ -290,6 +292,7 @@ struct device_handler *device_handler_init(struct discover_server *server,
 	handler->waitset = waitset;
 	handler->dry_run = dry_run;
 	handler->default_boot_option = NULL;
+	handler->default_enabled = true;
 	list_init(&handler->unresolved_boot_options);
 
 	/* set up our mount point base */
@@ -387,13 +390,43 @@ static void boot_status(void *arg, struct boot_status *status)
 	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;
@@ -405,10 +438,14 @@ static void set_default(struct device_handler *handler,
 	if (handler->default_boot_option)
 		return;
 
+	if (!handler->default_enabled)
+		return;
+
+	pb_log("Boot option %s set as default\n", opt->option->id);
+
 	handler->default_boot_option = opt;
-	handler->timeout_waiter = waiter_register_timeout(handler->waitset,
-					DEFAULT_BOOT_TIMEOUT_SEC * 1000,
-					default_timeout, handler);
+	handler->sec_to_boot = DEFAULT_BOOT_TIMEOUT_SEC;
+	default_timeout(handler);
 }
 
 static bool resource_is_resolved(struct resource *res)
@@ -423,6 +460,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);
 }
 
@@ -447,6 +485,7 @@ 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);
 }
 
@@ -458,6 +497,7 @@ static void boot_option_finalise(struct device_handler *handler,
 	/* 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);
 
@@ -465,6 +505,8 @@ static void boot_option_finalise(struct device_handler *handler,
 		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;
 
@@ -772,4 +814,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->default_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