X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=dd3aee92ca35d0385880b190f60a379494152ad8;hp=d14e54fd2ec99b5ee46cfa87bf0bc4582c6e6d64;hb=ae3c354e844698bdb4ed35a6845aa9dca1e9205f;hpb=050e48452f1c67195f8ac630f5893d4806fbe2d2

diff --git a/discover/device-handler.c b/discover/device-handler.c
index d14e54f..dd3aee9 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -1,33 +1,43 @@
-
 #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 <sys/mount.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 "user-event.h"
+#include "platform.h"
 #include "event.h"
 #include "parser.h"
 #include "resource.h"
-#include "udev.h"
 #include "paths.h"
+#include "sysinfo.h"
 #include "boot.h"
+#include "udev.h"
+#include "network.h"
 
 struct device_handler {
 	struct discover_server	*server;
 	int			dry_run;
 
+	struct pb_udev		*udev;
+	struct network		*network;
+	struct user_event	*user_event;
+
 	struct discover_device	**devices;
 	unsigned int		n_devices;
 
@@ -38,8 +48,17 @@ 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);
+static int umount_device(struct discover_device *dev);
+
+static int device_handler_init_sources(struct device_handler *handler);
+static void device_handler_reinit_sources(struct device_handler *handler);
+
 void discover_context_add_boot_option(struct discover_context *ctx,
 		struct discover_boot_option *boot_option)
 {
@@ -85,11 +104,6 @@ struct discover_boot_option *discover_boot_option_create(
 	return opt;
 }
 
-static int device_match_path(struct discover_device *dev, const char *path)
-{
-	return dev->device_path && !strcmp(dev->device_path, path);
-}
-
 static int device_match_uuid(struct discover_device *dev, const char *uuid)
 {
 	return dev->uuid && !strcmp(dev->uuid, uuid);
@@ -105,6 +119,12 @@ static int device_match_id(struct discover_device *dev, const char *id)
 	return !strcmp(dev->device->id, id);
 }
 
+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 struct discover_device *device_lookup(
 		struct device_handler *device_handler,
 		int (match_fn)(struct discover_device *, const char *),
@@ -129,26 +149,10 @@ static struct discover_device *device_lookup(
 struct discover_device *device_lookup_by_name(struct device_handler *handler,
 		const char *name)
 {
-	struct discover_device *dev;
-	char *path;
-
-	if (strncmp(name, "/dev/", strlen("/dev/")))
-		path = talloc_asprintf(NULL, "/dev/%s", name);
-	else
-		path = talloc_strdup(NULL, name);
-
-	dev = device_lookup_by_path(handler, path);
-
-	talloc_free(path);
+	if (!strncmp(name, "/dev/", strlen("/dev/")))
+		name += strlen("/dev/");
 
-	return dev;
-}
-
-struct discover_device *device_lookup_by_path(
-		struct device_handler *device_handler,
-		const char *path)
-{
-	return device_lookup(device_handler, device_match_path, path);
+	return device_lookup_by_id(handler, name);
 }
 
 struct discover_device *device_lookup_by_uuid(
@@ -172,128 +176,108 @@ struct discover_device *device_lookup_by_id(
 	return device_lookup(device_handler, device_match_id, id);
 }
 
+struct discover_device *device_lookup_by_serial(
+		struct device_handler *device_handler,
+		const char *serial)
+{
+	return device_lookup(device_handler, device_match_serial, serial);
+}
+
 void device_handler_destroy(struct device_handler *handler)
 {
 	talloc_free(handler);
 }
 
-#ifdef PETITBOOT_TEST
-
-/* we have a simplified interface for petitboot testing, but still want
- * to keep struct device_handler opaque. */
-struct device_handler *device_handler_init(
-		struct discover_server *server __attribute__((unused)),
-		struct waitset *waitset __attribute__((unused)),
-		int dry_run __attribute__((unused)))
+static int destroy_device(void *arg)
 {
-	struct device_handler *handler;
-
-	handler = talloc_zero(NULL, struct device_handler);
-	list_init(&handler->unresolved_boot_options);
+	struct discover_device *dev = arg;
 
-	return handler;
-}
+	umount_device(dev);
 
-void device_handler_add_device(struct device_handler *handler,
-		struct discover_device *dev)
-{
-	handler->n_devices++;
-	handler->devices = talloc_realloc(handler, handler->devices,
-		struct discover_device *, handler->n_devices);
-	handler->devices[handler->n_devices - 1] = dev;
+	return 0;
 }
 
-#else
-
-static int mount_device(struct discover_device *dev)
+struct discover_device *discover_device_create(struct device_handler *handler,
+		const char *id)
 {
-	const char *argv[6];
-
-	if (!dev->device_path)
-		return -1;
+	struct discover_device *dev;
 
-	if (!dev->mount_path)
-		dev->mount_path = join_paths(dev, mount_base(),
-						dev->device_path);
+	dev = device_lookup_by_id(handler, id);
+	if (dev)
+		return dev;
 
-	if (pb_mkdir_recursive(dev->mount_path))
-		pb_log("couldn't create mount directory %s: %s\n",
-				dev->mount_path, strerror(errno));
+	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);
 
-	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;
+	talloc_set_destructor(dev, destroy_device);
 
-	if (pb_run_cmd(argv, 1, 0)) {
+	return dev;
+}
 
-		/* Retry mount without ro option. */
+struct discover_device_param {
+	char			*name;
+	char			*value;
+	struct list_item	list;
+};
 
-		argv[0] = pb_system_apps.mount;
-		argv[1] = dev->device_path;
-		argv[2] = dev->mount_path;
-		argv[3] = NULL;
+void discover_device_set_param(struct discover_device *device,
+		const char *name, const char *value)
+{
+	struct discover_device_param *param;
+	bool found = false;
 
-		if (pb_run_cmd(argv, 1, 0))
-			goto out_rmdir;
+	list_for_each_entry(&device->params, param, list) {
+		if (!strcmp(param->name, name)) {
+			found = true;
+			break;
+		}
 	}
 
-	return 0;
+	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);
+	}
 
-out_rmdir:
-	pb_rmdir_recursive(mount_base(), dev->mount_path);
-	return -1;
+	param->value = talloc_strdup(param, value);
 }
 
-static int umount_device(struct discover_device *dev)
+const char *discover_device_get_param(struct discover_device *device,
+		const char *name)
 {
-	int status;
-	pid_t pid;
-
-	if (!dev->mount_path)
-		return 0;
-
-	pid = fork();
-	if (pid == -1) {
-		pb_log("%s: fork failed: %s\n", __func__, strerror(errno));
-		return -1;
-	}
+	struct discover_device_param *param;
 
-	if (pid == 0) {
-		execl(pb_system_apps.umount, pb_system_apps.umount,
-						dev->mount_path, NULL);
-		exit(EXIT_FAILURE);
+	list_for_each_entry(&device->params, param, list) {
+		if (!strcmp(param->name, name))
+			return param->value;
 	}
-
-	if (waitpid(pid, &status, 0) == -1) {
-		pb_log("%s: waitpid failed: %s\n", __func__,
-				strerror(errno));
-		return -1;
-	}
-
-	if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
-		return -1;
-
-	pb_rmdir_recursive(mount_base(), dev->mount_path);
-
-	return 0;
+	return NULL;
 }
 
 struct device_handler *device_handler_init(struct discover_server *server,
 		struct waitset *waitset, int dry_run)
 {
 	struct device_handler *handler;
+	int rc;
 
-	handler = talloc(NULL, struct device_handler);
-	handler->devices = NULL;
-	handler->n_devices = 0;
+	handler = talloc_zero(NULL, struct device_handler);
 	handler->server = server;
 	handler->waitset = waitset;
 	handler->dry_run = dry_run;
-	handler->default_boot_option = NULL;
 	handler->autoboot_enabled = config_get()->autoboot_enabled;
+
 	list_init(&handler->unresolved_boot_options);
 
 	/* set up our mount point base */
@@ -301,67 +285,44 @@ struct device_handler *device_handler_init(struct discover_server *server,
 
 	parser_init();
 
-	return handler;
-}
-
-static int destroy_device(void *arg)
-{
-	struct discover_device *dev = arg;
-
-	umount_device(dev);
-
-	return 0;
-}
-
-static struct discover_device *find_device(struct device_handler *handler,
-		const char *id)
-{
-	struct discover_device *dev;
-	unsigned int i;
-
-	for (i = 0; i < handler->n_devices; i++) {
-		dev = handler->devices[i];
-		if (!strcmp(dev->device->id, id))
-			return dev;
+	rc = device_handler_init_sources(handler);
+	if (rc) {
+		talloc_free(handler);
+		return NULL;
 	}
 
-	return NULL;
+	return handler;
 }
 
-static struct discover_device *discover_device_create(
-		struct device_handler *handler,
-		struct discover_context *ctx,
-		struct event *event)
+void device_handler_reinit(struct device_handler *handler)
 {
-	struct discover_device *dev;
-	const char *devname;
-
-	dev = find_device(handler, event->device);
-	if (dev)
-		return dev;
+	struct discover_boot_option *opt, *tmp;
+	unsigned int i;
 
-	dev = talloc_zero(ctx, struct discover_device);
-	dev->device = talloc_zero(dev, struct device);
-	list_init(&dev->boot_options);
+	device_handler_cancel_default(handler);
 
-	devname = event_get_param(ctx->event, "DEVNAME");
-	if (devname)
-		dev->device_path = talloc_strdup(dev, devname);
+	/* free unresolved boot options */
+	list_for_each_entry_safe(&handler->unresolved_boot_options,
+			opt, tmp, list)
+		talloc_free(opt);
+	list_init(&handler->unresolved_boot_options);
 
-	dev->device->id = talloc_strdup(dev, event->device);
+	/* drop all devices */
+	for (i = 0; i < handler->n_devices; i++)
+		discover_server_notify_device_remove(handler->server,
+				handler->devices[i]->device);
 
-	talloc_set_destructor(dev, destroy_device);
+	talloc_free(handler->devices);
+	handler->devices = NULL;
+	handler->n_devices = 0;
 
-	return dev;
+	device_handler_reinit_sources(handler);
 }
 
-/**
- * device_handler_remove - Remove a device from the handler device array.
- */
-
-static void device_handler_remove(struct device_handler *handler,
-	struct discover_device *device)
+void device_handler_remove(struct device_handler *handler,
+		struct discover_device *device)
 {
+	struct discover_boot_option *opt, *tmp;
 	unsigned int i;
 
 	for (i = 0; i < handler->n_devices; i++)
@@ -369,17 +330,29 @@ static void device_handler_remove(struct device_handler *handler,
 			break;
 
 	if (i == handler->n_devices) {
-		assert(0 && "unknown device");
+		talloc_free(device);
 		return;
 	}
 
+	/* Free any unresolved options, as they're currently allocated
+	 * against the handler */
+	list_for_each_entry_safe(&handler->unresolved_boot_options,
+			opt, tmp, list) {
+		if (opt->device != device)
+			continue;
+		list_remove(&opt->list);
+		talloc_free(opt);
+	}
+
 	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);
+	if (device->notified)
+		discover_server_notify_device_remove(handler->server,
+							device->device);
 
 	talloc_free(device);
 }
@@ -415,6 +388,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) {
@@ -426,24 +402,75 @@ static int default_timeout(void *arg)
 		return 0;
 	}
 
+	handler->timeout_waiter = NULL;
+
 	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;
+}
+
+static bool priority_match(struct boot_priority *prio,
+		struct discover_boot_option *opt)
+{
+	return prio->type == opt->device->device->type ||
+		prio->type == DEVICE_TYPE_ANY;
+}
+
+static int default_option_priority(struct discover_boot_option *opt)
+{
+	const struct config *config;
+	struct boot_priority *prio;
+	unsigned int i;
+
+	config = config_get();
+
+	for (i = 0; i < config->n_boot_priorities; i++) {
+		prio = &config->boot_priorities[i];
+		if (priority_match(prio, opt))
+			return prio->priority;
+	}
+
 	return 0;
 }
 
 static void set_default(struct device_handler *handler,
 		struct discover_boot_option *opt)
 {
-	if (handler->default_boot_option)
-		return;
+	int new_prio;
 
 	if (!handler->autoboot_enabled)
 		return;
 
+	new_prio = default_option_priority(opt);
+
+	/* A negative priority indicates that we don't want to boot this device
+	 * by default */
+	if (new_prio < 0)
+		return;
+
+	/* 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 cur_prio;
+
+		cur_prio = default_option_priority(
+					handler->default_boot_option);
+
+		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->sec_to_boot = config_get()->autoboot_timeout_sec;
 	handler->default_boot_option = opt;
-	handler->sec_to_boot = DEFAULT_BOOT_TIMEOUT_SEC;
 
 	pb_log("Boot option %s set as default, timeout %u sec.\n",
 	       opt->option->id, handler->sec_to_boot);
@@ -476,7 +503,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);
 
@@ -519,6 +546,18 @@ static void boot_option_finalise(struct device_handler *handler,
 		set_default(handler, opt);
 }
 
+static void notify_boot_option(struct device_handler *handler,
+		struct discover_boot_option *opt)
+{
+	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;
@@ -526,58 +565,47 @@ 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);
 		talloc_steal(opt->device, opt);
 		boot_option_finalise(handler, opt);
-		discover_server_notify_boot_option_add(handler->server,
-							opt->option);
+		notify_boot_option(handler, opt);
 	}
 }
 
+struct discover_context *device_handler_discover_context_create(
+		struct device_handler *handler,
+		struct discover_device *device)
+{
+	struct discover_context *ctx;
+
+	ctx = talloc_zero(handler, struct discover_context);
+	ctx->device = device;
+	list_init(&ctx->boot_options);
+
+	return ctx;
+}
+
 /**
  * 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,
+void device_handler_discover_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 = 0;
-
-	/* 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);
-
-		/* this new device might be able to resolve existing boot
-		 * options */
-		pb_log("New device %s, processing queue\n", dev->device->id);
-		process_boot_option_queue(handler);
-	}
 
+	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) {
@@ -590,8 +618,7 @@ static void context_commit(struct device_handler *handler,
 			list_add_tail(&dev->boot_options, &opt->list);
 			talloc_steal(dev, opt);
 			boot_option_finalise(handler, opt);
-			discover_server_notify_boot_option_add(handler->server,
-								opt->option);
+			notify_boot_option(handler, opt);
 		} else {
 			if (!opt->source->resolve_resource) {
 				pb_log("parser %s gave us an unresolved "
@@ -611,184 +638,86 @@ static void context_commit(struct device_handler *handler,
 	}
 }
 
-static int handle_add_udev_event(struct device_handler *handler,
-		struct event *event)
+void device_handler_add_device(struct device_handler *handler,
+		struct discover_device *device)
 {
-	struct discover_context *ctx;
-	struct discover_device *dev;
-	const char *param;
-	int rc;
-
-	/* create our context */
-	ctx = talloc(handler, struct discover_context);
-	ctx->event = event;
-	list_init(&ctx->boot_options);
+	handler->n_devices++;
+	handler->devices = talloc_realloc(handler, handler->devices,
+				struct discover_device *, handler->n_devices);
+	handler->devices[handler->n_devices - 1] = device;
 
-	/* create our top-level device */
-	dev = discover_device_create(handler, ctx, event);
+}
 
-	ctx->device = dev;
+/* 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)
+{
+	struct discover_context *ctx;
+	int rc;
 
-	/* try to parse UUID and labels */
-	param = event_get_param(ctx->event, "ID_FS_UUID");
-	if (param)
-		dev->uuid = talloc_strdup(dev, param);
+	process_boot_option_queue(handler);
 
-	param = event_get_param(ctx->event, "ID_FS_LABEL");
-	if (param)
-		dev->label = talloc_strdup(dev, param);
+	/* create our context */
+	ctx = device_handler_discover_context_create(handler, dev);
 
 	rc = mount_device(dev);
-	if (rc) {
-		talloc_free(ctx);
-		return 0;
-	}
+	if (rc)
+		goto out;
+
+	/* add this device to our system info */
+	system_info_register_blockdev(dev->device->id, dev->uuid,
+			dev->mount_path);
 
 	/* run the parsers. This will populate the ctx's boot_option list. */
-	iterate_parsers(ctx, CONF_METHOD_LOCAL_FILE);
+	iterate_parsers(ctx);
 
 	/* add discovered stuff to the handler */
-	context_commit(handler, ctx);
+	device_handler_discover_context_commit(handler, ctx);
 
+out:
 	talloc_free(ctx);
 
 	return 0;
 }
 
-static int handle_remove_udev_event(struct device_handler *handler,
-		struct event *event)
-{
-	struct discover_device *dev;
-
-	dev = find_device(handler, event->device);
-	if (!dev)
-		return 0;
-
-	/* remove device from handler device array */
-	device_handler_remove(handler, dev);
-
-	return 0;
-}
-
-static int handle_add_user_event(struct device_handler *handler,
-		struct event *event)
+/* Incoming dhcp event */
+int device_handler_dhcp(struct device_handler *handler,
+		struct discover_device *dev, struct event *event)
 {
 	struct discover_context *ctx;
-	struct discover_device *dev;
-	int rc;
-
-	assert(event->device);
 
-	ctx = talloc(handler, struct discover_context);
+	/* create our context */
+	ctx = device_handler_discover_context_create(handler, dev);
 	ctx->event = event;
-	list_init(&ctx->boot_options);
 
-	dev = discover_device_create(handler, ctx, event);
-	ctx->device = dev;
+	iterate_parsers(ctx);
 
-	rc = parse_user_event(ctx, event);
-
-	if (!rc)
-		context_commit(handler, ctx);
-
-	return rc;
-}
+	device_handler_discover_context_commit(handler, ctx);
 
-static int handle_remove_user_event(struct device_handler *handler,
-		struct event *event)
-{
-	struct discover_device *dev = find_device(handler, event->device);
-
-	if (!dev)
-		return 0;
-
-	/* remove device from handler device array */
-	device_handler_remove(handler, dev);
+	talloc_free(ctx);
 
 	return 0;
 }
 
-static enum conf_method parse_conf_method(const char *str)
+/* incoming conf event */
+int device_handler_conf(struct device_handler *handler,
+		struct discover_device *dev, struct pb_url *url)
 {
+        struct discover_context *ctx;
 
-	if (!strcasecmp(str, "dhcp")) {
-		return CONF_METHOD_DHCP;
-	}
-	return CONF_METHOD_UNKNOWN;
-}
-
-static int handle_conf_user_event(struct device_handler *handler,
-		struct event *event)
-{
-	struct discover_context *ctx;
-	struct discover_device *dev;
-	enum conf_method method;
-	const char *val;
-
-	ctx = talloc(handler, struct discover_context);
-	ctx->event = event;
-	list_init(&ctx->boot_options);
-
-	val = event_get_param(event, "url");
-	if (!val) {
-		talloc_free(ctx);
-		return 0;
-	}
-
-	ctx->conf_url = pb_url_parse(ctx, val);
-	if (!ctx->conf_url) {
-		talloc_free(ctx);
-		return 0;
-	}
+        /* create our context */
+        ctx = device_handler_discover_context_create(handler, dev);
+        ctx->conf_url = url;
 
-	val = event_get_param(event, "method");
-	if (!val) {
-		talloc_free(ctx);
-		return 0;
-	}
-
-	method = parse_conf_method(val);
-	if (method == CONF_METHOD_UNKNOWN) {
-		talloc_free(ctx);
-		return 0;
-	}
+        iterate_parsers(ctx);
 
-	dev = discover_device_create(handler, ctx, event);
-	ctx->device = dev;
+        device_handler_discover_context_commit(handler, ctx);
 
-	iterate_parsers(ctx, method);
+        talloc_free(ctx);
 
-	context_commit(handler, ctx);
-
-	return 0;
-}
-
-typedef int (*event_handler)(struct device_handler *, struct event *);
-
-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,
-		[EVENT_ACTION_CONF]	= handle_conf_user_event,
-	}
-};
-
-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;
-	}
-
-	return handlers[event->type][event->action](handler, event);
+        return 0;
 }
 
 static struct discover_boot_option *find_boot_option_by_id(
@@ -811,11 +740,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)
@@ -834,6 +768,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;
@@ -843,4 +783,239 @@ 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);
+	device_handler_reinit(handler);
+}
+
+#ifndef PETITBOOT_TEST
+
+static int device_handler_init_sources(struct device_handler *handler)
+{
+	/* init our device sources: udev, network and user events */
+	handler->udev = udev_init(handler, handler->waitset);
+	if (!handler->udev)
+		return -1;
+
+	handler->network = network_init(handler, handler->waitset,
+			handler->dry_run);
+	if (!handler->network)
+		return -1;
+
+	handler->user_event = user_event_init(handler, handler->waitset);
+	if (!handler->user_event)
+		return -1;
+
+	return 0;
+}
+
+static void device_handler_reinit_sources(struct device_handler *handler)
+{
+	udev_reinit(handler->udev);
+
+	network_shutdown(handler->network);
+	handler->network = network_init(handler, handler->waitset,
+			handler->dry_run);
+}
+
+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)
+{
+	const char *fstype;
+	int rc;
+
+	if (!dev->device_path)
+		return -1;
+
+	if (dev->mounted)
+		return 0;
+
+	if (check_existing_mount(dev))
+		return 0;
+
+	fstype = discover_device_get_param(dev, "ID_FS_TYPE");
+	if (!fstype)
+		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;
+	}
+
+	pb_log("mounting device %s read-only\n", dev->device_path);
+	errno = 0;
+	rc = mount(dev->device_path, dev->mount_path, fstype,
+			MS_RDONLY | MS_SILENT, "");
+	if (!rc) {
+		dev->mounted = true;
+		dev->mounted_rw = false;
+		dev->unmount = true;
+		return 0;
+	}
+
+	pb_log("couldn't mount device %s: mount failed: %s\n",
+			dev->device_path, strerror(errno));
+
+	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 rc;
+
+	if (!dev->mounted || !dev->unmount)
+		return 0;
+
+	pb_log("unmounting device %s\n", dev->device_path);
+	rc = umount(dev->mount_path);
+	if (rc)
+		return -1;
+
+	dev->mounted = false;
+
+	pb_rmdir_recursive(mount_base(), dev->mount_path);
+
+	talloc_free(dev->mount_path);
+	dev->mount_path = NULL;
+
+	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;
+
+	pb_log("remounting device %s read-write\n", dev->device_path);
+	rc = mount(dev->device_path, dev->mount_path, "",
+			MS_REMOUNT | MS_SILENT, "");
+	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;
+
+	pb_log("remounting device %s read-only\n", dev->device_path);
+	mount(dev->device_path, dev->mount_path, "",
+			MS_REMOUNT | MS_RDONLY | MS_SILENT, "");
+	dev->mounted_rw = false;
+}
+
+#else
+
+static int device_handler_init_sources(
+		struct device_handler *handler __attribute__((unused)))
+{
+	return 0;
+}
+
+static void device_handler_reinit_sources(
+		struct device_handler *handler __attribute__((unused)))
+{
+}
+
+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
+