discover: Avoid writing network overrides to NVRAM

[petitboot] / discover / device-handler.c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 346cb0221d7f08e8b5bcbd7b72f33c596f344f8b..70e4506c487ace8e7d7ce2b2354296dd82bbe79a 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -221,17 +221,22 @@ static int destroy_device(void *arg)
 }
 
 struct discover_device *discover_device_create(struct device_handler *handler,
-               const char *id)
+               const char *uuid, const char *id)
 {
        struct discover_device *dev;
 
-       dev = device_lookup_by_id(handler, id);
+       if (uuid)
+               dev = device_lookup_by_uuid(handler, uuid);
+       else
+               dev = device_lookup_by_id(handler, id);
+
        if (dev)
                return dev;
 
        dev = talloc_zero(handler, struct discover_device);
        dev->device = talloc_zero(dev, struct device);
        dev->device->id = talloc_strdup(dev->device, id);
+       dev->uuid = talloc_strdup(dev, uuid);
        list_init(&dev->params);
        list_init(&dev->boot_options);
 
@@ -921,36 +926,6 @@ int device_handler_dhcp(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;
-       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_unlink(handler, ctx);
-
-       return 0;
-}
-
 static struct discover_boot_option *find_boot_option_by_id(
                struct device_handler *handler, const char *id)
 {
@@ -1127,7 +1102,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);
@@ -1168,7 +1143,7 @@ void device_handler_process_url(struct device_handler *handler,
                goto msg;
        }
 
-       dev = discover_device_create(handler, event->device);
+       dev = discover_device_create(handler, mac, event->device);
        if (pb_url->scheme == pb_url_file)
                dev->device->type = DEVICE_TYPE_ANY;
        ctx = device_handler_discover_context_create(handler, dev);
@@ -1201,7 +1176,7 @@ void device_handler_discover_context_commit(struct device_handler *handler,
        struct discover_device *dev = ctx->device;
        struct discover_boot_option *opt, *tmp;
 
-       if (!device_lookup_by_id(handler, dev->device->id))
+       if (!device_lookup_by_uuid(handler, dev->uuid))
                device_handler_add_device(handler, dev);
 
        /* move boot options from the context to the device */