discover: Deprecate 'conf' user event

[petitboot] / discover / device-handler.c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 9fd9fab5cf5f60db1b8c372b7401cc07b511b176..54a19865d2bb2e061e179afcdb9d8b6a84287b30 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -359,6 +359,15 @@ void device_handler_remove(struct device_handler *handler,
        struct discover_boot_option *opt, *tmp;
        unsigned int i;
 
+       list_for_each_entry_safe(&device->boot_options, opt, tmp, list) {
+               if (opt == handler->default_boot_option) {
+                       pb_log("Default option %s cancelled since device removed",
+                                       opt->option->name);
+                       device_handler_cancel_default(handler);
+                       break;
+               }
+       }
+
        for (i = 0; i < handler->n_devices; i++)
                if (handler->devices[i] == device)
                        break;
@@ -604,6 +613,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->args_sig_file) &&
                resource_is_resolved(opt->icon);
 }
 
@@ -629,6 +639,8 @@ 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->args_sig_file, "args_sig_file", opt,
+                       handler) &&
                resource_resolve(opt->icon, "icon", opt, handler);
 }
 
@@ -643,6 +655,7 @@ static void boot_option_finalise(struct device_handler *handler,
        assert(!opt->option->dtb_file);
        assert(!opt->option->icon_file);
        assert(!opt->option->device_id);
+       assert(!opt->option->args_sig_file);
 
        if (opt->boot_image)
                opt->option->boot_image_file = opt->boot_image->url->full;
@@ -652,6 +665,8 @@ static void boot_option_finalise(struct device_handler *handler,
                opt->option->dtb_file = opt->dtb->url->full;
        if (opt->icon)
                opt->option->icon_file = opt->icon->url->full;
+       if (opt->args_sig_file)
+               opt->option->args_sig_file = opt->args_sig_file->url->full;
 
        opt->option->device_id = opt->device->device->id;
 
@@ -861,7 +876,7 @@ out:
        device_handler_boot_status(handler, status);
 
        talloc_free(status);
-       talloc_free(ctx);
+       talloc_unlink(handler, ctx);
 
        return 0;
 }
@@ -885,6 +900,7 @@ int device_handler_dhcp(struct device_handler *handler,
 
        /* create our context */
        ctx = device_handler_discover_context_create(handler, dev);
+       talloc_steal(ctx, event);
        ctx->event = event;
 
        iterate_parsers(ctx);
@@ -900,37 +916,7 @@ int device_handler_dhcp(struct device_handler *handler,
        device_handler_boot_status(handler, status);
 
        talloc_free(status);
-       talloc_free(ctx);
-
-       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;
-       struct boot_status *status;
-
-       status = talloc_zero(handler, struct boot_status);
-       status->type = BOOT_STATUS_INFO;
-       status->message = talloc_asprintf(status, _("Processing user config"));
-       device_handler_boot_status(handler, status);
-
-       /* 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);
-
-       status->message = talloc_asprintf(status,
-                               _("Processing user config complete"));
-       device_handler_boot_status(handler, status);
-
-       talloc_free(status);
-       talloc_free(ctx);
+       talloc_unlink(handler, ctx);
 
        return 0;
 }
@@ -1111,7 +1097,7 @@ void device_handler_process_url(struct device_handler *handler,
 
        event = talloc(handler, struct event);
        event->type = EVENT_TYPE_USER;
-       event->action = EVENT_ACTION_CONF;
+       event->action = EVENT_ACTION_URL;
 
        if (url[strlen(url) - 1] == '/') {
                event->params = talloc_array(event, struct param, 3);
@@ -1156,13 +1142,14 @@ void device_handler_process_url(struct device_handler *handler,
        if (pb_url->scheme == pb_url_file)
                dev->device->type = DEVICE_TYPE_ANY;
        ctx = device_handler_discover_context_create(handler, dev);
+       talloc_steal(ctx, event);
        ctx->event = event;
 
        iterate_parsers(ctx);
 
        device_handler_discover_context_commit(handler, ctx);
 
-       talloc_free(ctx);
+       talloc_unlink(handler, ctx);
 
        status->type = BOOT_STATUS_INFO;
        status->message = talloc_asprintf(status, _("Config file %s parsed"),
@@ -1191,6 +1178,14 @@ void device_handler_discover_context_commit(struct device_handler *handler,
        list_for_each_entry_safe(&ctx->boot_options, opt, tmp, list) {
                list_remove(&opt->list);
 
+               /* All boot options need at least a kernel image */
+               if (!opt->boot_image || !opt->boot_image->url) {
+                       pb_log("boot option %s is missing boot image, ignoring\n",
+                               opt->option->id);
+                       talloc_free(opt);
+                       continue;
+               }
+
                if (boot_option_resolve(opt, handler)) {
                        pb_log("boot option %s is resolved, "
                                        "sending to clients\n",
@@ -1564,6 +1559,41 @@ void device_release_write(struct discover_device *dev, bool release)
                dev->mounted = true;
 }
 
+void device_sync_snapshots(struct device_handler *handler, const char *device)
+{
+       struct discover_device *dev = NULL;
+       unsigned int i;
+
+       if (device) {
+               /* Find matching device and sync */
+               dev = device_lookup_by_name(handler, device);
+               if (!dev) {
+                       pb_log("%s: device name '%s' unrecognised\n",
+                               __func__, device);
+                       return;
+               }
+               if (dev->ramdisk)
+                       device_release_write(dev, true);
+               else
+                       pb_log("%s has no snapshot to merge, skipping\n",
+                               dev->device->id);
+               return;
+       }
+
+       /* Otherwise sync all relevant devices */
+       for (i = 0; i < handler->n_devices; i++) {
+               dev = handler->devices[i];
+               if (dev->device->type != DEVICE_TYPE_DISK &&
+                       dev->device->type != DEVICE_TYPE_USB)
+                       continue;
+               if (dev->ramdisk)
+                       device_release_write(dev, true);
+               else
+                       pb_log("%s has no snapshot to merge, skipping\n",
+                               dev->device->id);
+       }
+}
+
 #else
 
 void device_handler_discover_context_commit(
@@ -1611,4 +1641,10 @@ void device_release_write(struct discover_device *dev __attribute__((unused)),
 {
 }
 
+void device_sync_snapshots(
+               struct device_handler *handler __attribute__((unused)),
+               const char *device __attribute__((unused)))
+{
+}
+
 #endif