discover: Use pxeconffile for udhcpc option name

[petitboot] / discover / device-handler.c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 94abb514ab02f4ecd7c6f53aca81a94f7b8afb2f..725e491d1f6f9c87d11f1918826b049e0ba76885 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -1,4 +1,3 @@
-
 #include <assert.h>
 #include <stdlib.h>
 #include <stdbool.h>
@@ -40,6 +39,9 @@ struct device_handler {
 
        struct discover_boot_option *default_boot_option;
        struct list             unresolved_boot_options;
+
+       struct boot_task        *pending_boot;
+       bool                    pending_boot_is_default;
 };
 
 static int mount_device(struct discover_device *dev);
@@ -331,6 +333,9 @@ static int default_timeout(void *arg)
        if (!handler->default_boot_option)
                return 0;
 
+       if (handler->pending_boot)
+               return 0;
+
        opt = handler->default_boot_option;
 
        if (handler->sec_to_boot) {
@@ -346,8 +351,9 @@ static int default_timeout(void *arg)
 
        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);
+       handler->pending_boot = boot(handler, handler->default_boot_option,
+                       NULL, handler->dry_run, boot_status, handler);
+       handler->pending_boot_is_default = true;
        return 0;
 }
 
@@ -361,7 +367,7 @@ static int default_option_priority(struct discover_boot_option *opt)
 {
        const struct config *config;
        struct boot_priority *prio;
-       int i;
+       unsigned int i;
 
        config = config_get();
 
@@ -433,7 +439,7 @@ static bool resource_resolve(struct resource *res, const char *name,
        if (resource_is_resolved(res))
                return true;
 
-       pb_log("Attempting to resolve resource %s->%s with parser %s\n",
+       pb_debug("Attempting to resolve resource %s->%s with parser %s\n",
                        opt->option->id, name, parser->name);
        parser->resolve_resource(handler, res);
 
@@ -495,13 +501,13 @@ static void process_boot_option_queue(struct device_handler *handler)
        list_for_each_entry_safe(&handler->unresolved_boot_options,
                        opt, tmp, list) {
 
-               pb_log("queue: attempting resolution for %s\n",
+               pb_debug("queue: attempting resolution for %s\n",
                                opt->option->id);
 
                if (!boot_option_resolve(opt, handler))
                        continue;
 
-               pb_log("\tresolved!\n");
+               pb_debug("\tresolved!\n");
 
                list_remove(&opt->list);
                list_add_tail(&opt->device->boot_options, &opt->list);
@@ -517,10 +523,8 @@ struct discover_context *device_handler_discover_context_create(
 {
        struct discover_context *ctx;
 
-       ctx = talloc(handler, struct discover_context);
+       ctx = talloc_zero(handler, struct discover_context);
        ctx->device = device;
-       ctx->conf_url = NULL;
-       ctx->test_data = NULL;
        list_init(&ctx->boot_options);
 
        return ctx;
@@ -584,7 +588,7 @@ void device_handler_add_device(struct device_handler *handler,
  * array, but has only just been initialised by the hotplug source.
  */
 int device_handler_discover(struct device_handler *handler,
-               struct discover_device *dev, enum conf_method method)
+               struct discover_device *dev)
 {
        struct discover_context *ctx;
        int rc;
@@ -599,7 +603,7 @@ int device_handler_discover(struct device_handler *handler,
                goto out;
 
        /* run the parsers. This will populate the ctx's boot_option list. */
-       iterate_parsers(ctx, method);
+       iterate_parsers(ctx);
 
        /* add discovered stuff to the handler */
        device_handler_discover_context_commit(handler, ctx);
@@ -610,18 +614,17 @@ out:
        return 0;
 }
 
-/* incoming conf event */
-int device_handler_conf(struct device_handler *handler,
-               struct discover_device *dev, struct pb_url *url,
-               enum conf_method method)
+/* Incoming dhcp event */
+int device_handler_dhcp(struct device_handler *handler,
+               struct discover_device *dev, struct event *event)
 {
        struct discover_context *ctx;
 
        /* create our context */
        ctx = device_handler_discover_context_create(handler, dev);
-       ctx->conf_url = url;
+       ctx->event = event;
 
-       iterate_parsers(ctx, method);
+       iterate_parsers(ctx);
 
        device_handler_discover_context_commit(handler, ctx);
 
@@ -630,6 +633,25 @@ int device_handler_conf(struct device_handler *handler,
        return 0;
 }
 
+/* incoming conf event */
+int device_handler_conf(struct device_handler *handler,
+               struct discover_device *dev, struct pb_url *url)
+{
+        struct discover_context *ctx;
+
+        /* create our context */
+        ctx = device_handler_discover_context_create(handler, dev);
+        ctx->conf_url = url;
+
+        iterate_parsers(ctx);
+
+        device_handler_discover_context_commit(handler, ctx);
+
+        talloc_free(ctx);
+
+        return 0;
+}
+
 static struct discover_boot_option *find_boot_option_by_id(
                struct device_handler *handler, const char *id)
 {
@@ -650,11 +672,16 @@ static struct discover_boot_option *find_boot_option_by_id(
 void device_handler_boot(struct device_handler *handler,
                struct boot_command *cmd)
 {
-       struct discover_boot_option *opt;
+       struct discover_boot_option *opt = NULL;
 
-       opt = find_boot_option_by_id(handler, cmd->option_id);
+       if (cmd->option_id && strlen(cmd->option_id))
+               opt = find_boot_option_by_id(handler, cmd->option_id);
 
-       boot(handler, opt, cmd, handler->dry_run, boot_status, handler);
+       if (handler->pending_boot)
+               boot_cancel(handler->pending_boot);
+       handler->pending_boot = boot(handler, opt, cmd, handler->dry_run,
+                       boot_status, handler);
+       handler->pending_boot_is_default = false;
 }
 
 void device_handler_cancel_default(struct device_handler *handler)
@@ -673,6 +700,12 @@ void device_handler_cancel_default(struct device_handler *handler)
 
        pb_log("Cancelling default boot option\n");
 
+       if (handler->pending_boot && handler->pending_boot_is_default) {
+               boot_cancel(handler->pending_boot);
+               handler->pending_boot = NULL;
+               handler->pending_boot_is_default = false;
+       }
+
        handler->default_boot_option = NULL;
 
        status.type = BOOT_STATUS_INFO;
@@ -683,6 +716,13 @@ void device_handler_cancel_default(struct device_handler *handler)
        discover_server_notify_boot_status(handler->server, &status);
 }
 
+void device_handler_update_config(struct device_handler *handler,
+               struct config *config)
+{
+       config_set(config);
+       discover_server_notify_config(handler->server, config);
+}
+
 #ifndef PETITBOOT_TEST
 static bool check_existing_mount(struct discover_device *dev)
 {