X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=04a44848d4c452db00e7c9e80cda0b5c6274ac9e;hp=2b16b2ea2f7a9c937b864b66d28996cca9bae0cf;hb=9fbd73a208c9465b4bf9e2c80c7290b72e62ead1;hpb=e4f5bd235894c11823ac1befe8c8c43063cad026

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 2b16b2e..04a4484 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -1,23 +1,28 @@
 
 #include <assert.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
+#include <mntent.h>
 #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>
 #include <types/types.h>
 #include <system/system.h>
+#include <process/process.h>
+#include <url/url.h>
 
 #include "device-handler.h"
 #include "discover-server.h"
 #include "event.h"
 #include "parser.h"
-#include "udev.h"
+#include "resource.h"
 #include "paths.h"
 #include "boot.h"
 
@@ -27,85 +32,27 @@ struct device_handler {
 
 	struct discover_device	**devices;
 	unsigned int		n_devices;
-};
-
-/**
- * context_commit - Commit a temporary discovery context to the handler,
- * and notify the clients about any new options / devices
- */
-static void context_commit(struct device_handler *handler,
-		struct discover_context *ctx)
-{
-	struct discover_device *dev = ctx->device;
-	struct discover_boot_option *opt, *tmp;
-	unsigned int i, existing_device;
-
-	/* do we already have this device? */
-	for (i = 0; i < handler->n_devices; i++) {
-		if (ctx->device == handler->devices[i]) {
-			existing_device = 1;
-			break;
-		}
-	}
 
-	/* if not already present, add the device to the handler's array */
-	if (!existing_device) {
-		handler->n_devices++;
-		handler->devices = talloc_realloc(handler, handler->devices,
-			struct discover_device *, handler->n_devices);
-		handler->devices[handler->n_devices - 1] = dev;
-		talloc_steal(handler, dev);
-
-		discover_server_notify_device_add(handler->server, dev->device);
-	}
+	struct waitset		*waitset;
+	struct waiter		*timeout_waiter;
+	bool			autoboot_enabled;
+	unsigned int		sec_to_boot;
 
+	struct discover_boot_option *default_boot_option;
+	struct list		unresolved_boot_options;
+};
 
-	/* move boot options from the context to the device */
-	list_for_each_entry_safe(&ctx->boot_options, opt, tmp, list) {
-		list_remove(&opt->list);
-		list_add(&dev->boot_options, &opt->list);
-		talloc_steal(dev, opt);
-		discover_server_notify_boot_option_add(handler->server,
-							opt->option);
-	}
-}
+static int mount_device(struct discover_device *dev);
+static int umount_device(struct discover_device *dev);
 
 void discover_context_add_boot_option(struct discover_context *ctx,
 		struct discover_boot_option *boot_option)
 {
-	list_add(&ctx->boot_options, &boot_option->list);
+	boot_option->source = ctx->parser;
+	list_add_tail(&ctx->boot_options, &boot_option->list);
 	talloc_steal(ctx, boot_option);
 }
 
-/**
- * device_handler_remove - Remove a device from the handler device array.
- */
-
-static void device_handler_remove(struct device_handler *handler,
-	struct discover_device *device)
-{
-	unsigned int i;
-
-	for (i = 0; i < handler->n_devices; i++)
-		if (handler->devices[i] == device)
-			break;
-
-	if (i == handler->n_devices) {
-		assert(0 && "unknown device");
-		return;
-	}
-
-	handler->n_devices--;
-	memmove(&handler->devices[i], &handler->devices[i + 1],
-		(handler->n_devices - i) * sizeof(handler->devices[0]));
-	handler->devices = talloc_realloc(handler, handler->devices,
-		struct discover_device *, handler->n_devices);
-
-	discover_server_notify_device_remove(handler->server, device->device);
-
-	talloc_free(device);
-}
-
 /**
  * device_handler_get_device_count - Get the count of current handler devices.
  */
@@ -130,155 +77,101 @@ const struct discover_device *device_handler_get_device(
 	return handler->devices[index];
 }
 
-static void setup_device_links(struct discover_device *dev)
-{
-	struct link {
-		const char *dir, *val;
-	} *link, links[] = {
-		{
-			.dir = "disk/by-uuid",
-			.val = dev->uuid,
-		},
-		{
-			.dir = "disk/by-label",
-			.val = dev->label,
-		},
-		{
-			.dir = NULL
-		}
-	};
-
-	for (link = links; link->dir; link++) {
-		char *enc, *dir, *path;
-
-		if (!link->val || !*link->val)
-			continue;
-
-		enc = encode_label(dev, link->val);
-		dir = join_paths(dev, mount_base(), link->dir);
-		path = join_paths(dev, dir, enc);
-
-		if (!pb_mkdir_recursive(dir)) {
-			unlink(path);
-			if (symlink(dev->mount_path, path)) {
-				pb_log("symlink(%s,%s): %s\n",
-						dev->mount_path, path,
-						strerror(errno));
-				talloc_free(path);
-			} else {
-				int i = dev->n_links++;
-				dev->links = talloc_realloc(dev,
-						dev->links, char *,
-						dev->n_links);
-				dev->links[i] = path;
-			}
+struct discover_boot_option *discover_boot_option_create(
+		struct discover_context *ctx,
+		struct discover_device *device)
+{
+	struct discover_boot_option *opt;
 
-		}
+	opt = talloc_zero(ctx, struct discover_boot_option);
+	opt->option = talloc_zero(opt, struct boot_option);
+	opt->device = device;
 
-		talloc_free(dir);
-		talloc_free(enc);
-	}
+	return opt;
 }
 
-static void remove_device_links(struct discover_device *dev)
+static int device_match_uuid(struct discover_device *dev, const char *uuid)
 {
-	int i;
-
-	for (i = 0; i < dev->n_links; i++)
-		unlink(dev->links[i]);
+	return dev->uuid && !strcmp(dev->uuid, uuid);
 }
 
-static int mount_device(struct discover_device *dev)
+static int device_match_label(struct discover_device *dev, const char *label)
 {
-	const char *mountpoint;
-	const char *argv[6];
-
-	if (!dev->mount_path) {
-		mountpoint = mountpoint_for_device(dev->device_path);
-		dev->mount_path = talloc_strdup(dev, mountpoint);
-	}
-
-	if (pb_mkdir_recursive(dev->mount_path))
-		pb_log("couldn't create mount directory %s: %s\n",
-				dev->mount_path, strerror(errno));
-
-	argv[0] = pb_system_apps.mount;
-	argv[1] = dev->device_path;
-	argv[2] = dev->mount_path;
-	argv[3] = "-o";
-	argv[4] = "ro";
-	argv[5] = NULL;
-
-	if (pb_run_cmd(argv, 1, 0)) {
-
-		/* Retry mount without ro option. */
-
-		argv[0] = pb_system_apps.mount;
-		argv[1] = dev->device_path;
-		argv[2] = dev->mount_path;
-		argv[3] = NULL;
-
-		if (pb_run_cmd(argv, 1, 0))
-			goto out_rmdir;
-	}
+	return dev->label && !strcmp(dev->label, label);
+}
 
-	setup_device_links(dev);
-	return 0;
+static int device_match_id(struct discover_device *dev, const char *id)
+{
+	return !strcmp(dev->device->id, id);
+}
 
-out_rmdir:
-	pb_rmdir_recursive(mount_base(), dev->mount_path);
-	return -1;
+static int device_match_serial(struct discover_device *dev, const char *serial)
+{
+	const char *val = discover_device_get_param(dev, "ID_SERIAL");
+	return val && !strcmp(val, serial);
 }
 
-static int umount_device(struct discover_device *dev)
+static struct discover_device *device_lookup(
+		struct device_handler *device_handler,
+		int (match_fn)(struct discover_device *, const char *),
+		const char *str)
 {
-	int status;
-	pid_t pid;
+	struct discover_device *dev;
+	unsigned int i;
 
-	remove_device_links(dev);
+	if (!str)
+		return NULL;
 
-	if (!dev->mount_path)
-		return 0;
+	for (i = 0; i < device_handler->n_devices; i++) {
+		dev = device_handler->devices[i];
 
-	pid = fork();
-	if (pid == -1) {
-		pb_log("%s: fork failed: %s\n", __func__, strerror(errno));
-		return -1;
+		if (match_fn(dev, str))
+			return dev;
 	}
 
-	if (pid == 0) {
-		execl(pb_system_apps.umount, pb_system_apps.umount,
-						dev->mount_path, NULL);
-		exit(EXIT_FAILURE);
-	}
+	return NULL;
+}
 
-	if (waitpid(pid, &status, 0) == -1) {
-		pb_log("%s: waitpid failed: %s\n", __func__,
-				strerror(errno));
-		return -1;
-	}
+struct discover_device *device_lookup_by_name(struct device_handler *handler,
+		const char *name)
+{
+	if (!strncmp(name, "/dev/", strlen("/dev/")))
+		name += strlen("/dev/");
 
-	if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
-		return -1;
+	return device_lookup_by_id(handler, name);
+}
 
-	pb_rmdir_recursive(mount_base(), dev->mount_path);
+struct discover_device *device_lookup_by_uuid(
+		struct device_handler *device_handler,
+		const char *uuid)
+{
+	return device_lookup(device_handler, device_match_uuid, uuid);
+}
 
-	return 0;
+struct discover_device *device_lookup_by_label(
+		struct device_handler *device_handler,
+		const char *label)
+{
+	return device_lookup(device_handler, device_match_label, label);
 }
 
-static struct discover_device *find_device(struct device_handler *handler,
+struct discover_device *device_lookup_by_id(
+		struct device_handler *device_handler,
 		const char *id)
 {
-	struct discover_device *dev;
-	unsigned int i;
+	return device_lookup(device_handler, device_match_id, id);
+}
 
-	for (i = 0; i < handler->n_devices; i++) {
-		dev = handler->devices[i];
-		if (!strcmp(dev->device->id, id))
-			return dev;
-	}
+struct discover_device *device_lookup_by_serial(
+		struct device_handler *device_handler,
+		const char *serial)
+{
+	return device_lookup(device_handler, device_match_serial, serial);
+}
 
-	return NULL;
+void device_handler_destroy(struct device_handler *handler)
+{
+	talloc_free(handler);
 }
 
 static int destroy_device(void *arg)
@@ -290,280 +183,451 @@ static int destroy_device(void *arg)
 	return 0;
 }
 
-static struct discover_device *discover_device_create(
-		struct device_handler *handler,
-		struct discover_context *ctx,
-		struct event *event)
+struct discover_device *discover_device_create(struct device_handler *handler,
+		const char *id)
 {
 	struct discover_device *dev;
-	const char *devname;
 
-	dev = find_device(handler, event->device);
+	dev = device_lookup_by_id(handler, id);
 	if (dev)
 		return dev;
 
-	dev = talloc_zero(ctx, struct discover_device);
+	dev = talloc_zero(handler, struct discover_device);
 	dev->device = talloc_zero(dev, struct device);
+	dev->device->id = talloc_strdup(dev->device, id);
+	list_init(&dev->params);
 	list_init(&dev->boot_options);
 
-	devname = event_get_param(ctx->event, "DEVNAME");
-	if (devname)
-		dev->device_path = talloc_strdup(dev, devname);
-
-	dev->device->id = talloc_strdup(dev, event->device);
-
 	talloc_set_destructor(dev, destroy_device);
 
 	return dev;
 }
 
-struct discover_boot_option *discover_boot_option_create(
-		struct discover_context *ctx,
-		struct discover_device *device)
+struct discover_device_param {
+	char			*name;
+	char			*value;
+	struct list_item	list;
+};
+
+void discover_device_set_param(struct discover_device *device,
+		const char *name, const char *value)
 {
-	struct discover_boot_option *opt;
+	struct discover_device_param *param;
+	bool found = false;
 
-	opt = talloc_zero(ctx, struct discover_boot_option);
-	opt->option = talloc_zero(opt, struct boot_option);
-	opt->device = device;
+	list_for_each_entry(&device->params, param, list) {
+		if (!strcmp(param->name, name)) {
+			found = true;
+			break;
+		}
+	}
 
-	return opt;
+	if (!found) {
+		if (!value)
+			return;
+		param = talloc(device, struct discover_device_param);
+		param->name = talloc_strdup(param, name);
+		list_add(&device->params, &param->list);
+	} else {
+		if (!value) {
+			list_remove(&param->list);
+			talloc_free(param);
+			return;
+		}
+		talloc_free(param->value);
+	}
+
+	param->value = talloc_strdup(param, value);
 }
 
+const char *discover_device_get_param(struct discover_device *device,
+		const char *name)
+{
+	struct discover_device_param *param;
 
-static int handle_add_udev_event(struct device_handler *handler,
-		struct event *event)
+	list_for_each_entry(&device->params, param, list) {
+		if (!strcmp(param->name, name))
+			return param->name;
+	}
+	return NULL;
+}
+
+struct device_handler *device_handler_init(struct discover_server *server,
+		struct waitset *waitset, int dry_run)
 {
-	struct discover_context *ctx;
-	struct discover_device *dev;
-	const char *param;
-	int rc;
+	struct device_handler *handler;
 
-	/* create our context */
-	ctx = talloc(handler, struct discover_context);
-	ctx->event = event;
-	list_init(&ctx->boot_options);
+	handler = talloc_zero(NULL, struct device_handler);
+	handler->server = server;
+	handler->waitset = waitset;
+	handler->dry_run = dry_run;
+	handler->autoboot_enabled = config_get()->autoboot_enabled;
 
-	/* create our top-level device */
-	dev = discover_device_create(handler, ctx, event);
+	list_init(&handler->unresolved_boot_options);
 
-	ctx->device = dev;
+	/* set up our mount point base */
+	pb_mkdir_recursive(mount_base());
 
-	/* try to parse UUID and labels */
-	param = event_get_param(ctx->event, "ID_FS_UUID");
-	if (param)
-		dev->uuid = talloc_strdup(dev, param);
+	parser_init();
 
-	param = event_get_param(ctx->event, "ID_FS_LABEL");
-	if (param)
-		dev->label = talloc_strdup(dev, param);
+	return handler;
+}
 
-	rc = mount_device(dev);
-	if (rc) {
-		talloc_free(ctx);
-		return 0;
+void device_handler_remove(struct device_handler *handler,
+		struct discover_device *device)
+{
+	unsigned int i;
+
+	for (i = 0; i < handler->n_devices; i++)
+		if (handler->devices[i] == device)
+			break;
+
+	if (i == handler->n_devices) {
+		talloc_free(device);
+		return;
 	}
 
-	/* run the parsers. This will populate the ctx's boot_option list. */
-	iterate_parsers(ctx);
+	handler->n_devices--;
+	memmove(&handler->devices[i], &handler->devices[i + 1],
+		(handler->n_devices - i) * sizeof(handler->devices[0]));
+	handler->devices = talloc_realloc(handler, handler->devices,
+		struct discover_device *, handler->n_devices);
 
-	/* add discovered stuff to the handler */
-	context_commit(handler, ctx);
+	if (device->notified)
+		discover_server_notify_device_remove(handler->server,
+							device->device);
 
-	talloc_free(ctx);
+	talloc_free(device);
+}
 
-	return 0;
+static void boot_status(void *arg, struct boot_status *status)
+{
+	struct device_handler *handler = arg;
+
+	discover_server_notify_boot_status(handler->server, status);
 }
 
-static int handle_remove_udev_event(struct device_handler *handler,
-		struct event *event)
+static void countdown_status(struct device_handler *handler,
+		struct discover_boot_option *opt, unsigned int sec)
 {
-	struct discover_device *dev;
+	struct boot_status status;
 
-	dev = find_device(handler, event->device);
-	if (!dev)
-		return 0;
+	status.type = BOOT_STATUS_INFO;
+	status.progress = -1;
+	status.detail = NULL;
+	status.message = talloc_asprintf(handler,
+			"Booting %s in %u sec", opt->option->name, sec);
 
-	/* remove device from handler device array */
-	device_handler_remove(handler, dev);
+	discover_server_notify_boot_status(handler->server, &status);
 
-	return 0;
+	talloc_free(status.message);
 }
 
-static int handle_add_user_event(struct device_handler *handler,
-		struct event *event)
+static int default_timeout(void *arg)
 {
-	struct discover_context *ctx;
-	struct discover_device *dev;
-	int rc;
+	struct device_handler *handler = arg;
+	struct discover_boot_option *opt;
 
-	assert(event->device);
+	if (!handler->default_boot_option)
+		return 0;
 
-	ctx = talloc(handler, struct discover_context);
-	ctx->event = event;
-	list_init(&ctx->boot_options);
+	opt = handler->default_boot_option;
 
-	dev = discover_device_create(handler, ctx, event);
-	ctx->device = dev;
+	if (handler->sec_to_boot) {
+		countdown_status(handler, opt, handler->sec_to_boot);
+		handler->sec_to_boot--;
+		handler->timeout_waiter = waiter_register_timeout(
+						handler->waitset, 1000,
+						default_timeout, handler);
+		return 0;
+	}
 
-	rc = parse_user_event(ctx, event);
+	handler->timeout_waiter = NULL;
 
-	if (!rc)
-		context_commit(handler, ctx);
+	pb_log("Timeout expired, booting default option %s\n", opt->option->id);
 
-	return rc;
+	boot(handler, handler->default_boot_option, NULL,
+			handler->dry_run, boot_status, handler);
+	return 0;
 }
 
-static int handle_remove_user_event(struct device_handler *handler,
-		struct event *event)
+static bool priority_match(struct boot_priority *prio,
+		struct discover_boot_option *opt)
 {
-	struct discover_device *dev = find_device(handler, event->device);
-
-	if (!dev)
-		return 0;
-
-	/* remove device from handler device array */
-	device_handler_remove(handler, dev);
-
-	return 0;
+	return prio->type == opt->device->device->type;
 }
 
-typedef int (*event_handler)(struct device_handler *, struct event *);
+static int default_option_priority(struct discover_boot_option *opt)
+{
+	const struct config *config;
+	struct boot_priority *prio;
+	int i;
 
-static event_handler handlers[EVENT_TYPE_MAX][EVENT_ACTION_MAX] = {
-	[EVENT_TYPE_UDEV] = {
-		[EVENT_ACTION_ADD]	= handle_add_udev_event,
-		[EVENT_ACTION_REMOVE]	= handle_remove_udev_event,
-	},
-	[EVENT_TYPE_USER] = {
-		[EVENT_ACTION_ADD]	= handle_add_user_event,
-		[EVENT_ACTION_REMOVE]	= handle_remove_user_event,
-	}
-};
+	config = config_get();
 
-int device_handler_event(struct device_handler *handler,
-		struct event *event)
-{
-	if (event->type >= EVENT_TYPE_MAX ||
-			event->action >= EVENT_ACTION_MAX ||
-			!handlers[event->type][event->action]) {
-		pb_log("%s unknown type/action: %d/%d\n", __func__,
-				event->type, event->action);
-		return 0;
+	for (i = 0; i < config->n_boot_priorities; i++) {
+		prio = &config->boot_priorities[i];
+		if (priority_match(prio, opt))
+			break;
 	}
 
-	return handlers[event->type][event->action](handler, event);
+	return i;
 }
 
-struct device_handler *device_handler_init(struct discover_server *server,
-		int dry_run)
+static void set_default(struct device_handler *handler,
+		struct discover_boot_option *opt)
 {
-	struct device_handler *handler;
+	if (!handler->autoboot_enabled)
+		return;
 
-	handler = talloc(NULL, struct device_handler);
-	handler->devices = NULL;
-	handler->n_devices = 0;
-	handler->server = server;
-	handler->dry_run = dry_run;
+	/* Resolve any conflicts: if we have a new default option, it only
+	 * replaces the current if it has a higher priority. */
+	if (handler->default_boot_option) {
+		int new_prio, cur_prio;
 
-	/* set up our mount point base */
-	pb_mkdir_recursive(mount_base());
+		new_prio = default_option_priority(opt);
+		cur_prio = default_option_priority(
+					handler->default_boot_option);
 
-	parser_init();
+		if (new_prio < cur_prio) {
+			handler->default_boot_option = opt;
+			/* extend the timeout a little, so the user sees some
+			 * indication of the change */
+			handler->sec_to_boot += 2;
+		}
 
-	return handler;
-}
+		return;
+	}
 
-void device_handler_destroy(struct device_handler *handler)
-{
-	talloc_free(handler);
+	handler->sec_to_boot = config_get()->autoboot_timeout_sec;
+	handler->default_boot_option = opt;
+
+	pb_log("Boot option %s set as default, timeout %u sec.\n",
+	       opt->option->id, handler->sec_to_boot);
+
+	default_timeout(handler);
 }
 
-static int device_match_path(struct discover_device *dev, const char *path)
+static bool resource_is_resolved(struct resource *res)
 {
-	return !strcmp(dev->device_path, path);
+	return !res || res->resolved;
 }
 
-static int device_match_uuid(struct discover_device *dev, const char *uuid)
+/* We only use this in an assert, which will disappear if we're compiling
+ * with NDEBUG, so we need the 'used' attribute for these builds */
+static bool __attribute__((used)) boot_option_is_resolved(
+		struct discover_boot_option *opt)
 {
-	return dev->uuid && !strcmp(dev->uuid, uuid);
+	return resource_is_resolved(opt->boot_image) &&
+		resource_is_resolved(opt->initrd) &&
+		resource_is_resolved(opt->dtb) &&
+		resource_is_resolved(opt->icon);
 }
 
-static int device_match_label(struct discover_device *dev, const char *label)
+static bool resource_resolve(struct resource *res, const char *name,
+		struct discover_boot_option *opt,
+		struct device_handler *handler)
 {
-	return dev->label && !strcmp(dev->label, label);
+	struct parser *parser = opt->source;
+
+	if (resource_is_resolved(res))
+		return true;
+
+	pb_log("Attempting to resolve resource %s->%s with parser %s\n",
+			opt->option->id, name, parser->name);
+	parser->resolve_resource(handler, res);
+
+	return res->resolved;
 }
 
-static int device_match_id(struct discover_device *dev, const char *id)
+static bool boot_option_resolve(struct discover_boot_option *opt,
+		struct device_handler *handler)
 {
-	return !strcmp(dev->device->id, id);
+	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);
 }
 
-static struct discover_device *device_lookup(
-		struct device_handler *device_handler,
-		int (match_fn)(struct discover_device *, const char *),
-		const char *str)
+static void boot_option_finalise(struct device_handler *handler,
+		struct discover_boot_option *opt)
 {
-	struct discover_device *dev;
-	unsigned int i;
+	assert(boot_option_is_resolved(opt));
 
-	if (!str)
-		return NULL;
+	/* 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);
 
-	for (i = 0; i < device_handler->n_devices; i++) {
-		dev = device_handler->devices[i];
+	if (opt->boot_image)
+		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;
 
-		if (match_fn(dev, str))
-			return dev;
-	}
+	opt->option->device_id = opt->device->device->id;
 
-	return NULL;
+	if (opt->option->is_default)
+		set_default(handler, opt);
 }
 
-struct discover_device *device_lookup_by_name(struct device_handler *handler,
-		const char *name)
+static void notify_boot_option(struct device_handler *handler,
+		struct discover_boot_option *opt)
 {
-	struct discover_device *dev;
-	char *path;
+	struct discover_device *dev = opt->device;
+
+	if (!dev->notified)
+		discover_server_notify_device_add(handler->server,
+						  opt->device->device);
+	dev->notified = true;
+	discover_server_notify_boot_option_add(handler->server, opt->option);
+}
+
+static void process_boot_option_queue(struct device_handler *handler)
+{
+	struct discover_boot_option *opt, *tmp;
 
-	if (strncmp(name, "/dev/", strlen("/dev/")))
-		path = talloc_asprintf(NULL, "/dev/%s", name);
-	else
-		path = talloc_strdup(NULL, name);
+	list_for_each_entry_safe(&handler->unresolved_boot_options,
+			opt, tmp, list) {
 
-	dev = device_lookup_by_path(handler, path);
+		pb_log("queue: attempting resolution for %s\n",
+				opt->option->id);
 
-	talloc_free(path);
+		if (!boot_option_resolve(opt, handler))
+			continue;
 
-	return dev;
+		pb_log("\tresolved!\n");
+
+		list_remove(&opt->list);
+		list_add_tail(&opt->device->boot_options, &opt->list);
+		talloc_steal(opt->device, opt);
+		boot_option_finalise(handler, opt);
+		notify_boot_option(handler, opt);
+	}
 }
 
-struct discover_device *device_lookup_by_path(
-		struct device_handler *device_handler,
-		const char *path)
+struct discover_context *device_handler_discover_context_create(
+		struct device_handler *handler,
+		struct discover_device *device)
 {
-	return device_lookup(device_handler, device_match_path, path);
+	struct discover_context *ctx;
+
+	ctx = talloc(handler, struct discover_context);
+	ctx->device = device;
+	ctx->conf_url = NULL;
+	ctx->test_data = NULL;
+	list_init(&ctx->boot_options);
+
+	return ctx;
 }
 
-struct discover_device *device_lookup_by_uuid(
-		struct device_handler *device_handler,
-		const char *uuid)
+/**
+ * context_commit - Commit a temporary discovery context to the handler,
+ * and notify the clients about any new options / devices
+ */
+void device_handler_discover_context_commit(struct device_handler *handler,
+		struct discover_context *ctx)
 {
-	return device_lookup(device_handler, device_match_uuid, uuid);
+	struct discover_device *dev = ctx->device;
+	struct discover_boot_option *opt, *tmp;
+
+	if (!device_lookup_by_id(handler, dev->device->id))
+		device_handler_add_device(handler, dev);
+
+	/* move boot options from the context to the device */
+	list_for_each_entry_safe(&ctx->boot_options, opt, tmp, list) {
+		list_remove(&opt->list);
+
+		if (boot_option_resolve(opt, handler)) {
+			pb_log("boot option %s is resolved, "
+					"sending to clients\n",
+					opt->option->id);
+			list_add_tail(&dev->boot_options, &opt->list);
+			talloc_steal(dev, opt);
+			boot_option_finalise(handler, opt);
+			notify_boot_option(handler, opt);
+		} else {
+			if (!opt->source->resolve_resource) {
+				pb_log("parser %s gave us an unresolved "
+					"resource (%s), but no way to "
+					"resolve it\n",
+					opt->source->name, opt->option->id);
+				talloc_free(opt);
+			} else {
+				pb_log("boot option %s is unresolved, "
+						"adding to queue\n",
+						opt->option->id);
+				list_add(&handler->unresolved_boot_options,
+						&opt->list);
+				talloc_steal(handler, opt);
+			}
+		}
+	}
 }
 
-struct discover_device *device_lookup_by_label(
-		struct device_handler *device_handler,
-		const char *label)
+void device_handler_add_device(struct device_handler *handler,
+		struct discover_device *device)
 {
-	return device_lookup(device_handler, device_match_label, label);
+	handler->n_devices++;
+	handler->devices = talloc_realloc(handler, handler->devices,
+				struct discover_device *, handler->n_devices);
+	handler->devices[handler->n_devices - 1] = device;
+
 }
 
-struct discover_device *device_lookup_by_id(
-		struct device_handler *device_handler,
-		const char *id)
+/* Start discovery on a hotplugged device. The device will be in our devices
+ * 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)
 {
-	return device_lookup(device_handler, device_match_id, id);
+	struct discover_context *ctx;
+	int rc;
+
+	process_boot_option_queue(handler);
+
+	/* create our context */
+	ctx = device_handler_discover_context_create(handler, dev);
+
+	rc = mount_device(dev);
+	if (rc)
+		goto out;
+
+	/* run the parsers. This will populate the ctx's boot_option list. */
+	iterate_parsers(ctx, method);
+
+	/* add discovered stuff to the handler */
+	device_handler_discover_context_commit(handler, ctx);
+
+out:
+	talloc_free(ctx);
+
+	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)
+{
+	struct discover_context *ctx;
+
+	/* create our context */
+	ctx = device_handler_discover_context_create(handler, dev);
+	ctx->conf_url = url;
+
+	iterate_parsers(ctx, method);
+
+	device_handler_discover_context_commit(handler, ctx);
+
+	talloc_free(ctx);
+
+	return 0;
 }
 
 static struct discover_boot_option *find_boot_option_by_id(
@@ -590,5 +654,219 @@ void device_handler_boot(struct device_handler *handler,
 
 	opt = find_boot_option_by_id(handler, cmd->option_id);
 
-	boot(handler, opt->option, cmd, handler->dry_run);
+	boot(handler, opt, cmd, handler->dry_run, boot_status, handler);
+}
+
+void device_handler_cancel_default(struct device_handler *handler)
+{
+	struct boot_status status;
+
+	if (handler->timeout_waiter)
+		waiter_remove(handler->timeout_waiter);
+
+	handler->timeout_waiter = NULL;
+	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;
+	status.progress = -1;
+	status.detail = NULL;
+	status.message = "Default boot cancelled";
+
+	discover_server_notify_boot_status(handler->server, &status);
+}
+
+#ifndef PETITBOOT_TEST
+static bool check_existing_mount(struct discover_device *dev)
+{
+	struct stat devstat, mntstat;
+	struct mntent *mnt;
+	FILE *fp;
+	int rc;
+
+	rc = stat(dev->device_path, &devstat);
+	if (rc) {
+		pb_debug("%s: stat failed: %s\n", __func__, strerror(errno));
+		return false;
+	}
+
+	if (!S_ISBLK(devstat.st_mode)) {
+		pb_debug("%s: %s isn't a block device?\n", __func__,
+				dev->device_path);
+		return false;
+	}
+
+	fp = fopen("/proc/self/mounts", "r");
+
+	for (;;) {
+		mnt = getmntent(fp);
+		if (!mnt)
+			break;
+
+		if (!mnt->mnt_fsname || mnt->mnt_fsname[0] != '/')
+			continue;
+
+		rc = stat(mnt->mnt_fsname, &mntstat);
+		if (rc)
+			continue;
+
+		if (!S_ISBLK(mntstat.st_mode))
+			continue;
+
+		if (mntstat.st_rdev == devstat.st_rdev) {
+			dev->mount_path = talloc_strdup(dev, mnt->mnt_dir);
+			dev->mounted_rw = !!hasmntopt(mnt, "rw");
+			dev->mounted = true;
+			dev->unmount = false;
+
+			pb_debug("%s: %s is already mounted (r%c) at %s\n",
+					__func__, dev->device_path,
+					dev->mounted_rw ? 'w' : 'o',
+					mnt->mnt_dir);
+			break;
+		}
+	}
+
+	fclose(fp);
+
+	return mnt != NULL;
 }
+
+static int mount_device(struct discover_device *dev)
+{
+	int rc;
+
+	if (!dev->device_path)
+		return -1;
+
+	if (dev->mounted)
+		return 0;
+
+	if (check_existing_mount(dev))
+		return 0;
+
+	dev->mount_path = join_paths(dev, mount_base(),
+					dev->device_path);
+
+	if (pb_mkdir_recursive(dev->mount_path)) {
+		pb_log("couldn't create mount directory %s: %s\n",
+				dev->mount_path, strerror(errno));
+		goto err_free;
+	}
+
+	rc = process_run_simple(dev, pb_system_apps.mount,
+			dev->device_path, dev->mount_path,
+			"-o", "ro", NULL);
+	if (!rc) {
+		dev->mounted = true;
+		dev->mounted_rw = false;
+		dev->unmount = true;
+		return 0;
+	}
+
+	/* Retry mount without ro option. */
+	rc = process_run_simple(dev, pb_system_apps.mount,
+			dev->device_path, dev->mount_path, NULL);
+
+	if (!rc) {
+		dev->mounted = true;
+		dev->mounted_rw = true;
+		dev->unmount = true;
+		return 0;
+	}
+
+	pb_rmdir_recursive(mount_base(), dev->mount_path);
+err_free:
+	talloc_free(dev->mount_path);
+	dev->mount_path = NULL;
+	return -1;
+}
+
+static int umount_device(struct discover_device *dev)
+{
+	int status;
+
+	if (!dev->mounted || !dev->unmount)
+		return 0;
+
+	status = process_run_simple(dev, pb_system_apps.umount,
+			dev->mount_path, NULL);
+
+	if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
+		return -1;
+
+	dev->mounted = false;
+	talloc_free(dev->mount_path);
+	dev->mount_path = NULL;
+
+	pb_rmdir_recursive(mount_base(), dev->mount_path);
+
+	return 0;
+}
+
+int device_request_write(struct discover_device *dev, bool *release)
+{
+	int rc;
+
+	*release = false;
+
+	if (!dev->mounted)
+		return -1;
+
+	if (dev->mounted_rw)
+		return 0;
+
+	rc = process_run_simple(dev, pb_system_apps.mount, dev->mount_path,
+			"-o", "remount,rw", NULL);
+	if (rc)
+		return -1;
+
+	dev->mounted_rw = true;
+	*release = true;
+	return 0;
+}
+
+void device_release_write(struct discover_device *dev, bool release)
+{
+	if (!release)
+		return;
+
+	process_run_simple(dev, pb_system_apps.mount, dev->mount_path,
+			"-o", "remount,ro", NULL);
+	dev->mounted_rw = false;
+}
+
+#else
+
+static int umount_device(struct discover_device *dev __attribute__((unused)))
+{
+	return 0;
+}
+
+static int __attribute__((unused)) mount_device(
+		struct discover_device *dev __attribute__((unused)))
+{
+	return 0;
+}
+
+int device_request_write(struct discover_device *dev __attribute__((unused)),
+		bool *release)
+{
+	*release = true;
+	return 0;
+}
+
+void device_release_write(struct discover_device *dev __attribute__((unused)),
+	bool release __attribute__((unused)))
+{
+}
+
+#endif
+