X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=d14e54fd2ec99b5ee46cfa87bf0bc4582c6e6d64;hb=c7e26c27c7e029e6670dfebc8f27d9295e9fdeb7;hp=46fecd2c15566deaa12df3a94e896c0a939e4a0d;hpb=0f9597ab801ad4591e943bd7efcb8f1549997fdd;p=petitboot

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 46fecd2..d14e54f 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -7,6 +7,7 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 
+#include <pb-config/pb-config.h>
 #include <talloc/talloc.h>
 #include <list/list.h>
 #include <log/log.h>
@@ -32,7 +33,7 @@ struct device_handler {
 
 	struct waitset		*waitset;
 	struct waiter		*timeout_waiter;
-	bool			default_enabled;
+	bool			autoboot_enabled;
 	unsigned int		sec_to_boot;
 
 	struct discover_boot_option *default_boot_option;
@@ -292,7 +293,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;
+	handler->autoboot_enabled = config_get()->autoboot_enabled;
 	list_init(&handler->unresolved_boot_options);
 
 	/* set up our mount point base */
@@ -399,7 +400,7 @@ static void countdown_status(struct device_handler *handler,
 	status.progress = -1;
 	status.detail = NULL;
 	status.message = talloc_asprintf(handler,
-			"Booting %s in %d sec", opt->option->name, sec);
+			"Booting %s in %u sec", opt->option->name, sec);
 
 	discover_server_notify_boot_status(handler->server, &status);
 
@@ -438,13 +439,15 @@ static void set_default(struct device_handler *handler,
 	if (handler->default_boot_option)
 		return;
 
-	if (!handler->default_enabled)
+	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;
+
+	pb_log("Boot option %s set as default, timeout %u sec.\n",
+	       opt->option->id, handler->sec_to_boot);
+
 	default_timeout(handler);
 }
 
@@ -460,6 +463,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);
 }
 
@@ -484,6 +488,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);
 }
 
@@ -495,6 +500,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);
 
@@ -502,6 +508,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;
 
@@ -818,7 +826,7 @@ void device_handler_cancel_default(struct device_handler *handler)
 		waiter_remove(handler->timeout_waiter);
 
 	handler->timeout_waiter = NULL;
-	handler->default_enabled = false;
+	handler->autoboot_enabled = false;
 
 	/* we only send status if we had a default boot option queued */
 	if (!handler->default_boot_option)