discover: Display devices currently being parsed
[petitboot] / discover / device-handler.c
index e991662d6a372eb5e45dc8625b75f0314d1261d9..d95a37cb0c7c41ae420001d4c227cfa012c33b2f 100644 (file)
@@ -1,44 +1,83 @@
-
 #include <assert.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
+#include <mntent.h>
+#include <locale.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <sys/mount.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 <i18n/i18n.h>
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <arpa/inet.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"
+#include "ipmi.h"
+
+enum default_priority {
+       DEFAULT_PRIORITY_REMOTE         = 1,
+       DEFAULT_PRIORITY_LOCAL_FIRST    = 2,
+       DEFAULT_PRIORITY_LOCAL_LAST     = 0xfe,
+       DEFAULT_PRIORITY_DISABLED       = 0xff,
+};
 
 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;
 
        struct waitset          *waitset;
        struct waiter           *timeout_waiter;
-       bool                    default_enabled;
+       bool                    autoboot_enabled;
        unsigned int            sec_to_boot;
 
        struct discover_boot_option *default_boot_option;
+       int                     default_boot_option_priority;
+
        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);
+
+static void device_handler_update_lang(const char *lang);
+
 void discover_context_add_boot_option(struct discover_context *ctx,
                struct discover_boot_option *boot_option)
 {
@@ -84,11 +123,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);
@@ -104,6 +138,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 *),
@@ -128,26 +168,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);
+       if (!strncmp(name, "/dev/", strlen("/dev/")))
+               name += strlen("/dev/");
 
-       dev = device_lookup_by_path(handler, path);
-
-       talloc_free(path);
-
-       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(
@@ -171,128 +195,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;
+       struct discover_device_param *param;
 
-       if (!dev->mount_path)
-               return 0;
-
-       pid = fork();
-       if (pid == -1) {
-               pb_log("%s: fork failed: %s\n", __func__, strerror(errno));
-               return -1;
-       }
-
-       if (pid == 0) {
-               execl(pb_system_apps.umount, pb_system_apps.umount,
-                                               dev->mount_path, NULL);
-               exit(EXIT_FAILURE);
-       }
-
-       if (waitpid(pid, &status, 0) == -1) {
-               pb_log("%s: waitpid failed: %s\n", __func__,
-                               strerror(errno));
-               return -1;
+       list_for_each_entry(&device->params, param, list) {
+               if (!strcmp(param->name, name))
+                       return param->value;
        }
-
-       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->default_enabled = true;
+       handler->autoboot_enabled = config_get()->autoboot_enabled;
+
        list_init(&handler->unresolved_boot_options);
 
        /* set up our mount point base */
@@ -300,67 +304,47 @@ 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;
+       if (config_get()->safe_mode)
+               return handler;
 
-       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++)
@@ -368,17 +352,34 @@ 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);
+       }
+
+       /* if this is a network device, we have to unregister it from the
+        * network code */
+       if (device->device->type == DEVICE_TYPE_NETWORK)
+               network_unregister_device(handler->network, device);
+
        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);
 }
@@ -399,7 +400,7 @@ static void countdown_status(struct device_handler *handler,
        status.progress = -1;
        status.detail = NULL;
        status.message = talloc_asprintf(handler,
-                       "Booting %s in %d sec", opt->option->name, sec);
+                       _("Booting in %d sec: %s"), sec, opt->option->name);
 
        discover_server_notify_boot_status(handler->server, &status);
 
@@ -414,6 +415,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) {
@@ -425,22 +429,149 @@ static int default_timeout(void *arg)
                return 0;
        }
 
-       boot(handler, handler->default_boot_option, NULL,
-                       handler->dry_run, boot_status, handler);
+       handler->timeout_waiter = NULL;
+
+       pb_log("Timeout expired, booting default option %s\n", opt->option->id);
+
+       handler->pending_boot = boot(handler, handler->default_boot_option,
+                       NULL, handler->dry_run, boot_status, handler);
+       handler->pending_boot_is_default = true;
        return 0;
 }
 
+struct {
+       enum ipmi_bootdev       ipmi_type;
+       enum device_type        device_type;
+} device_type_map[] = {
+       { IPMI_BOOTDEV_NETWORK, DEVICE_TYPE_NETWORK },
+       { IPMI_BOOTDEV_DISK, DEVICE_TYPE_DISK },
+       { IPMI_BOOTDEV_CDROM, DEVICE_TYPE_OPTICAL },
+};
+
+static bool ipmi_device_type_matches(enum ipmi_bootdev ipmi_type,
+               enum device_type device_type)
+{
+       unsigned int i;
+
+       for (i = 0; i < ARRAY_SIZE(device_type_map); i++) {
+               if (device_type_map[i].device_type == device_type)
+                       return device_type_map[i].ipmi_type == ipmi_type;
+       }
+
+       return false;
+}
+
+static int autoboot_option_priority(const struct config *config,
+                               struct discover_boot_option *opt)
+{
+       enum device_type type = opt->device->device->type;
+       const char *uuid = opt->device->uuid;
+       struct autoboot_option *auto_opt;
+       unsigned int i;
+
+       for (i = 0; i < config->n_autoboot_opts; i++) {
+               auto_opt = &config->autoboot_opts[i];
+               if (auto_opt->boot_type == BOOT_DEVICE_UUID)
+                       if (!strcmp(auto_opt->uuid, uuid))
+                               return DEFAULT_PRIORITY_LOCAL_FIRST + i;
+
+               if (auto_opt->boot_type == BOOT_DEVICE_TYPE)
+                       if (auto_opt->type == type ||
+                           auto_opt->type == DEVICE_TYPE_ANY)
+                               return DEFAULT_PRIORITY_LOCAL_FIRST + i;
+       }
+
+       return -1;
+}
+
+/*
+ * We have different priorities to resolve conflicts between boot options that
+ * report to be the default for their device. This function assigns a priority
+ * for these options.
+ */
+static enum default_priority default_option_priority(
+               struct discover_boot_option *opt)
+{
+       const struct config *config;
+
+       config = config_get();
+
+       /* We give highest priority to IPMI-configured boot options. If
+        * we have an IPMI bootdev configuration set, then we don't allow
+        * any other defaults */
+       if (config->ipmi_bootdev) {
+               bool ipmi_match = ipmi_device_type_matches(config->ipmi_bootdev,
+                               opt->device->device->type);
+               if (ipmi_match)
+                       return DEFAULT_PRIORITY_REMOTE;
+
+               pb_debug("handler: disabled default priority due to "
+                               "non-matching IPMI type %x\n",
+                               config->ipmi_bootdev);
+               return DEFAULT_PRIORITY_DISABLED;
+       }
+
+       /* Next, try to match the option against the user-defined autoboot
+        * options, either by device UUID or type. */
+       if (config->n_autoboot_opts) {
+               int boot_match = autoboot_option_priority(config, opt);
+               if (boot_match > 0)
+                       return boot_match;
+       }
+
+       /* If the option didn't match any entry in the array, it is disabled */
+       pb_debug("handler: disabled default priority due to "
+                       "non-matching UUID or type\n");
+       return DEFAULT_PRIORITY_DISABLED;
+}
+
 static void set_default(struct device_handler *handler,
                struct discover_boot_option *opt)
 {
-       if (handler->default_boot_option)
+       enum default_priority cur_prio, new_prio;
+
+       if (!handler->autoboot_enabled)
                return;
 
-       if (!handler->default_enabled)
+       pb_debug("handler: new default option: %s\n", opt->option->id);
+
+       new_prio = default_option_priority(opt);
+
+       /* Anything outside our range prevents a default boot */
+       if (new_prio >= DEFAULT_PRIORITY_DISABLED)
+               return;
+
+       pb_debug("handler: calculated priority %d\n", new_prio);
+
+       /* 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) {
+
+               cur_prio = handler->default_boot_option_priority;
+
+               if (new_prio < cur_prio) {
+                       pb_log("handler: new prio %d beats "
+                                       "old prio %d for %s\n",
+                                       new_prio, cur_prio,
+                                       handler->default_boot_option
+                                               ->option->id);
+                       handler->default_boot_option = opt;
+                       handler->default_boot_option_priority = new_prio;
+                       /* 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;
+       handler->default_boot_option_priority = new_prio;
+
+       pb_log("handler: boot option %s set as default, timeout %u sec.\n",
+              opt->option->id, handler->sec_to_boot);
+
        default_timeout(handler);
 }
 
@@ -456,6 +587,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->icon);
 }
 
@@ -468,7 +600,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);
 
@@ -480,6 +612,7 @@ 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->icon, "icon", opt, handler);
 }
 
@@ -491,6 +624,7 @@ static void boot_option_finalise(struct device_handler *handler,
        /* 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);
 
@@ -498,6 +632,8 @@ static void boot_option_finalise(struct device_handler *handler,
                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;
 
@@ -507,6 +643,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;
@@ -514,58 +662,48 @@ 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;
+       ctx->network = handler->network;
+       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) {
@@ -578,8 +716,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 "
@@ -599,234 +736,637 @@ 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;
+       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 context */
-       ctx = talloc(handler, struct discover_context);
-       ctx->event = event;
-       list_init(&ctx->boot_options);
+       if (device->device->type == DEVICE_TYPE_NETWORK)
+               network_register_device(handler->network, device);
+}
 
-       /* create our top-level device */
-       dev = discover_device_create(handler, ctx, event);
+/* 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;
+       struct boot_status *status;
+       int rc;
 
-       ctx->device = dev;
+       status = talloc_zero(handler, struct boot_status);
+       status->type = BOOT_STATUS_INFO;
+       status->message = talloc_asprintf(status, "Processing %s device %s",
+                               device_type_display_name(dev->device->type),
+                               dev->device->id);
+       boot_status(handler, status);
 
-       /* 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:
+       status->message = talloc_asprintf(status,"Processing %s complete\n",
+                               dev->device->id);
+       boot_status(handler, status);
+
+       talloc_free(status);
        talloc_free(ctx);
 
        return 0;
 }
 
-static int handle_remove_udev_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_device *dev;
+       struct discover_context *ctx;
+       struct boot_status *status;
 
-       dev = find_device(handler, event->device);
-       if (!dev)
-               return 0;
+       status = talloc_zero(handler, struct boot_status);
+       status->type = BOOT_STATUS_INFO;
+       status->message = talloc_asprintf(status, "Processing dhcp event on %s",
+                               dev->device->id);
+       boot_status(handler, status);
+
+       /* create our context */
+       ctx = device_handler_discover_context_create(handler, dev);
+       ctx->event = event;
 
-       /* remove device from handler device array */
-       device_handler_remove(handler, dev);
+       iterate_parsers(ctx);
+
+       device_handler_discover_context_commit(handler, ctx);
+
+       status->message = talloc_asprintf(status,"Processing %s complete\n",
+                               dev->device->id);
+       boot_status(handler, status);
+
+       talloc_free(status);
+       talloc_free(ctx);
 
        return 0;
 }
 
-static int handle_add_user_event(struct device_handler *handler,
-               struct event *event)
+/* incoming conf event */
+int device_handler_conf(struct device_handler *handler,
+               struct discover_device *dev, struct pb_url *url)
 {
-       struct discover_context *ctx;
-       struct discover_device *dev;
-       int rc;
+        struct discover_context *ctx;
+       struct boot_status *status;
 
-       assert(event->device);
+       status = talloc_zero(handler, struct boot_status);
+       status->type = BOOT_STATUS_INFO;
+       status->message = talloc_asprintf(status, "Processing user config");
+       boot_status(handler, status);
 
-       ctx = talloc(handler, struct discover_context);
-       ctx->event = event;
-       list_init(&ctx->boot_options);
+        /* create our context */
+        ctx = device_handler_discover_context_create(handler, dev);
+        ctx->conf_url = url;
+
+        iterate_parsers(ctx);
 
-       dev = discover_device_create(handler, ctx, event);
-       ctx->device = dev;
+        device_handler_discover_context_commit(handler, ctx);
 
-       rc = parse_user_event(ctx, event);
+       status->message = talloc_asprintf(status,
+                               "Processing user config complete");
+       boot_status(handler, status);
 
-       if (!rc)
-               context_commit(handler, ctx);
+       talloc_free(status);
+        talloc_free(ctx);
 
-       return rc;
+        return 0;
 }
 
-static int handle_remove_user_event(struct device_handler *handler,
-               struct event *event)
+static struct discover_boot_option *find_boot_option_by_id(
+               struct device_handler *handler, const char *id)
 {
-       struct discover_device *dev = find_device(handler, event->device);
+       unsigned int i;
 
-       if (!dev)
-               return 0;
+       for (i = 0; i < handler->n_devices; i++) {
+               struct discover_device *dev = handler->devices[i];
+               struct discover_boot_option *opt;
 
-       /* remove device from handler device array */
-       device_handler_remove(handler, dev);
+               list_for_each_entry(&dev->boot_options, opt, list)
+                       if (!strcmp(opt->option->id, id))
+                               return opt;
+       }
 
-       return 0;
+       return NULL;
+}
+
+void device_handler_boot(struct device_handler *handler,
+               struct boot_command *cmd)
+{
+       struct discover_boot_option *opt = NULL;
+
+       if (cmd->option_id && strlen(cmd->option_id))
+               opt = find_boot_option_by_id(handler, cmd->option_id);
+
+       if (handler->pending_boot)
+               boot_cancel(handler->pending_boot);
+
+       platform_pre_boot();
+
+       handler->pending_boot = boot(handler, opt, cmd, handler->dry_run,
+                       boot_status, handler);
+       handler->pending_boot_is_default = false;
 }
 
-static enum conf_method parse_conf_method(const char *str)
+void device_handler_cancel_default(struct device_handler *handler)
 {
+       struct boot_status status;
 
-       if (!strcasecmp(str, "dhcp")) {
-               return CONF_METHOD_DHCP;
+       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");
+
+       if (handler->pending_boot && handler->pending_boot_is_default) {
+               boot_cancel(handler->pending_boot);
+               handler->pending_boot = NULL;
+               handler->pending_boot_is_default = false;
        }
-       return CONF_METHOD_UNKNOWN;
+
+       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);
 }
 
-static int handle_conf_user_event(struct device_handler *handler,
-               struct event *event)
+void device_handler_update_config(struct device_handler *handler,
+               struct config *config)
 {
-       struct discover_context *ctx;
-       struct discover_device *dev;
-       enum conf_method method;
-       const char *val;
+       int rc;
 
-       ctx = talloc(handler, struct discover_context);
-       ctx->event = event;
-       list_init(&ctx->boot_options);
+       rc = config_set(config);
+       if (rc)
+               return;
 
-       val = event_get_param(event, "url");
-       if (!val) {
-               talloc_free(ctx);
-               return 0;
+       discover_server_notify_config(handler->server, config);
+       device_handler_update_lang(config->lang);
+       device_handler_reinit(handler);
+}
+
+static char *device_from_addr(void *ctx, struct pb_url *url)
+{
+       char *ipaddr, *buf, *tok, *dev = NULL;
+       const char *delim = " ";
+       struct sockaddr_in *ip;
+       struct sockaddr_in si;
+       struct addrinfo *res;
+       struct process *p;
+       int rc;
+
+       /* Note: IPv4 only */
+       rc = inet_pton(AF_INET, url->host, &(si.sin_addr));
+       if (rc > 0) {
+               ipaddr = url->host;
+       } else {
+               /* need to turn hostname into a valid IP */
+               rc = getaddrinfo(url->host, NULL, NULL, &res);
+               if (rc) {
+                       pb_debug("%s: Invalid URL\n",__func__);
+                       return NULL;
+               }
+               ipaddr = talloc_array(ctx,char,INET_ADDRSTRLEN);
+               ip = (struct sockaddr_in *) res->ai_addr;
+               inet_ntop(AF_INET, &(ip->sin_addr), ipaddr, INET_ADDRSTRLEN);
+               freeaddrinfo(res);
        }
 
-       ctx->conf_url = pb_url_parse(ctx, val);
-       if (!ctx->conf_url) {
-               talloc_free(ctx);
-               return 0;
+       const char *argv[] = {
+               pb_system_apps.ip,
+               "route", "show", "to", "match",
+               ipaddr,
+               NULL
+       };
+
+       p = process_create(ctx);
+
+       p->path = pb_system_apps.ip;
+       p->argv = argv;
+       p->keep_stdout = true;
+
+       rc = process_run_sync(p);
+
+       if (rc) {
+               /* ip has complained for some reason; most likely
+                * there is no route to the host - bail out */
+               pb_debug("%s: No route to %s\n",__func__,url->host);
+               return NULL;
        }
 
-       val = event_get_param(event, "method");
-       if (!val) {
-               talloc_free(ctx);
-               return 0;
+       buf = p->stdout_buf;
+       /* If a route is found, ip-route output will be of the form
+        * "... dev DEVNAME ... " */
+       tok = strtok(buf, delim);
+       while (tok) {
+               if (!strcmp(tok, "dev")) {
+                       tok = strtok(NULL, delim);
+                       dev = talloc_strdup(ctx, tok);
+                       break;
+               }
+               tok = strtok(NULL, delim);
        }
 
-       method = parse_conf_method(val);
-       if (method == CONF_METHOD_UNKNOWN) {
-               talloc_free(ctx);
-               return 0;
+       process_release(p);
+       if (dev)
+               pb_debug("%s: Found interface '%s'\n", __func__,dev);
+       return dev;
+}
+
+
+void device_handler_process_url(struct device_handler *handler,
+               const char *url)
+{
+       struct discover_context *ctx;
+       struct discover_device *dev;
+       struct boot_status *status;
+       struct pb_url *pb_url;
+       struct event *event;
+       struct param *param;
+
+       status = talloc(handler, struct boot_status);
+
+       status->type = BOOT_STATUS_ERROR;
+       status->progress = 0;
+       status->detail = talloc_asprintf(status,
+                       _("Received config URL %s"), url);
+
+       if (!handler->network) {
+               status->message = talloc_asprintf(handler,
+                                       _("No network configured"));
+               goto msg;
+       }
+
+       event = talloc(handler, struct event);
+       event->type = EVENT_TYPE_USER;
+       event->action = EVENT_ACTION_CONF;
+
+       event->params = talloc_array(event, struct param, 1);
+       param = &event->params[0];
+       param->name = talloc_strdup(event, "pxeconffile");
+       param->value = talloc_strdup(event, url);
+       event->n_params = 1;
+
+       pb_url = pb_url_parse(event, event->params->value);
+       if (!pb_url || !pb_url->host) {
+               status->message = talloc_asprintf(handler,
+                                       _("Invalid config URL!"));
+               goto msg;
        }
 
-       dev = discover_device_create(handler, ctx, event);
-       ctx->device = dev;
+       event->device = device_from_addr(event, pb_url);
+       if (!event->device) {
+               status->message = talloc_asprintf(status,
+                                       _("Unable to route to host %s"),
+                                       pb_url->host);
+               goto msg;
+       }
+
+       dev = discover_device_create(handler, event->device);
+       ctx = device_handler_discover_context_create(handler, dev);
+       ctx->event = event;
+
+       iterate_parsers(ctx);
 
-       iterate_parsers(ctx, method);
+       device_handler_discover_context_commit(handler, ctx);
 
-       context_commit(handler, ctx);
+       talloc_free(ctx);
+
+       status->type = BOOT_STATUS_INFO;
+       status->message = talloc_asprintf(status, _("Config file %s parsed"),
+                                       pb_url->file);
+msg:
+       boot_status(handler, status);
+       talloc_free(status);
+}
+
+#ifndef PETITBOOT_TEST
+
+static void device_handler_update_lang(const char *lang)
+{
+       const char *cur_lang;
+
+       if (!lang)
+               return;
+
+       cur_lang = setlocale(LC_ALL, NULL);
+       if (cur_lang && !strcmp(cur_lang, lang))
+               return;
+
+       setlocale(LC_ALL, lang);
+}
+
+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;
 }
 
-typedef int (*event_handler)(struct device_handler *, struct event *);
+static void device_handler_reinit_sources(struct device_handler *handler)
+{
+       /* if we haven't initialised sources previously (becuase we started in
+        * safe mode), then init once here. */
+       if (!(handler->udev || handler->network || handler->user_event)) {
+               device_handler_init_sources(handler);
+               return;
+       }
+
+       udev_reinit(handler->udev);
+
+       network_shutdown(handler->network);
+       handler->network = network_init(handler, handler->waitset,
+                       handler->dry_run);
+}
+
+static const char *fs_parameters(unsigned int rw_flags, const char *fstype)
+{
+       if ((rw_flags | MS_RDONLY) != MS_RDONLY)
+               return "";
+
+       /* Avoid writing back to the disk on journaled filesystems */
+       if (!strncmp(fstype, "ext4", strlen("ext4")))
+               return "norecovery";
+       if (!strncmp(fstype, "xfs", strlen("xfs")))
+               return "norecovery";
+
+       return "";
+}
+
+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;
+       }
 
-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,
+       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;
+               }
        }
-};
 
-int device_handler_event(struct device_handler *handler,
-               struct event *event)
+       fclose(fp);
+
+       return mnt != NULL;
+}
+
+static int mount_device(struct discover_device *dev)
 {
-       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);
+       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;
+
+       /* ext3 treats the norecovery option as an error, so mount the device
+        * as an ext4 filesystem instead */
+       if (!strncmp(fstype, "ext3", strlen("ext3"))) {
+               pb_debug("Mounting ext3 filesystem as ext4\n");
+               fstype = talloc_asprintf(dev, "ext4");
        }
 
-       return handlers[event->type][event->action](handler, event);
+       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,
+                       fs_parameters(MS_RDONLY, fstype));
+       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 struct discover_boot_option *find_boot_option_by_id(
-               struct device_handler *handler, const char *id)
+static int umount_device(struct discover_device *dev)
 {
-       unsigned int i;
+       int rc;
 
-       for (i = 0; i < handler->n_devices; i++) {
-               struct discover_device *dev = handler->devices[i];
-               struct discover_boot_option *opt;
+       if (!dev->mounted || !dev->unmount)
+               return 0;
 
-               list_for_each_entry(&dev->boot_options, opt, list)
-                       if (!strcmp(opt->option->id, id))
-                               return opt;
+       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)
+{
+       const char *fstype;
+       int rc;
+
+       *release = false;
+
+       if (!dev->mounted)
+               return -1;
+
+       if (dev->mounted_rw)
+               return 0;
+
+       fstype = discover_device_get_param(dev, "ID_FS_TYPE");
+
+       pb_log("remounting device %s read-write\n", dev->device_path);
+
+       rc = umount(dev->mount_path);
+       if (rc) {
+               pb_log("Failed to unmount %s\n", dev->mount_path);
+               return -1;
        }
+       rc = mount(dev->device_path, dev->mount_path, fstype,
+                       MS_SILENT,
+                       fs_parameters(MS_REMOUNT, fstype));
+       if (rc)
+               goto mount_ro;
+
+       dev->mounted_rw = true;
+       *release = true;
+       return 0;
 
-       return NULL;
+mount_ro:
+       pb_log("Unable to remount device %s read-write\n", dev->device_path);
+       rc = mount(dev->device_path, dev->mount_path, fstype,
+                       MS_RDONLY | MS_SILENT,
+                       fs_parameters(MS_RDONLY, fstype));
+       if (rc)
+               pb_log("Unable to recover mount for %s\n", dev->device_path);
+       return -1;
 }
 
-void device_handler_boot(struct device_handler *handler,
-               struct boot_command *cmd)
+void device_release_write(struct discover_device *dev, bool release)
 {
-       struct discover_boot_option *opt;
+       const char *fstype;
+
+       if (!release)
+               return;
 
-       opt = find_boot_option_by_id(handler, cmd->option_id);
+       fstype = discover_device_get_param(dev, "ID_FS_TYPE");
 
-       boot(handler, opt, cmd, handler->dry_run, boot_status, handler);
+       pb_log("remounting device %s read-only\n", dev->device_path);
+       mount(dev->device_path, dev->mount_path, "",
+                       MS_REMOUNT | MS_RDONLY | MS_SILENT,
+                       fs_parameters(MS_RDONLY, fstype));
+       dev->mounted_rw = false;
 }
 
-void device_handler_cancel_default(struct device_handler *handler)
+#else
+
+static void device_handler_update_lang(const char *lang __attribute__((unused)))
 {
-       struct boot_status status;
+}
 
-       if (handler->timeout_waiter)
-               waiter_remove(handler->timeout_waiter);
+static int device_handler_init_sources(
+               struct device_handler *handler __attribute__((unused)))
+{
+       return 0;
+}
 
-       handler->timeout_waiter = NULL;
-       handler->default_enabled = false;
+static void device_handler_reinit_sources(
+               struct device_handler *handler __attribute__((unused)))
+{
+}
 
-       /* we only send status if we had a default boot option queued */
-       if (!handler->default_boot_option)
-               return;
+static int umount_device(struct discover_device *dev __attribute__((unused)))
+{
+       return 0;
+}
 
-       handler->default_boot_option = NULL;
+static int __attribute__((unused)) mount_device(
+               struct discover_device *dev __attribute__((unused)))
+{
+       return 0;
+}
 
-       status.type = BOOT_STATUS_INFO;
-       status.progress = -1;
-       status.detail = NULL;
-       status.message = "Default boot cancelled";
+int device_request_write(struct discover_device *dev __attribute__((unused)),
+               bool *release)
+{
+       *release = true;
+       return 0;
+}
 
-       discover_server_notify_boot_status(handler->server, &status);
+void device_release_write(struct discover_device *dev __attribute__((unused)),
+       bool release __attribute__((unused)))
+{
 }
+
 #endif
+