discover: Rename default_enabled

[petitboot] / discover / device-handler.c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index e991662d6a372eb5e45dc8625b75f0314d1261d9..ee99f2166da870e6fbb1e368b1a1b9311af611b6 100644 (file)
--- 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 */
@@ -425,6 +426,8 @@ static int default_timeout(void *arg)
                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;
@@ -436,9 +439,11 @@ 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;
        default_timeout(handler);
@@ -456,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);
 }
 
@@ -480,6 +486,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);
 }
 
@@ -491,6 +498,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);
 
@@ -498,6 +506,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;
 
@@ -814,12 +824,14 @@ 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)
                return;
 
+       pb_log("Cancelling default boot option\n");
+
        handler->default_boot_option = NULL;
 
        status.type = BOOT_STATUS_INFO;