+ 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;
+}
+
+struct device_handler *device_handler_init(struct discover_server *server,
+ int dry_run)
+{
+ struct device_handler *handler;
+
+ handler = talloc(NULL, struct device_handler);
+ handler->devices = NULL;
+ handler->n_devices = 0;
+ handler->server = server;
+ handler->dry_run = dry_run;
+ list_init(&handler->unresolved_boot_options);
+
+ /* set up our mount point base */
+ pb_mkdir_recursive(mount_base());
+
+ 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;
+ }
+
+ return NULL;
+}
+
+static struct discover_device *discover_device_create(
+ struct device_handler *handler,
+ struct discover_context *ctx,
+ struct event *event)
+{
+ struct discover_device *dev;
+ const char *devname;
+
+ dev = find_device(handler, event->device);
+ if (dev)
+ return dev;
+
+ dev = talloc_zero(ctx, struct discover_device);
+ dev->device = talloc_zero(dev, struct device);
+ 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;
+}
+
+/**
+ * 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);
+}
+
+static bool resource_is_resolved(struct resource *res)
+{
+ return !res || res->resolved;
+}
+
+/* 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 resource_is_resolved(opt->boot_image) &&
+ resource_is_resolved(opt->initrd) &&
+ resource_is_resolved(opt->icon);
+}
+
+static bool resource_resolve(struct resource *res, struct parser *parser,
+ struct device_handler *handler)
+{
+ if (resource_is_resolved(res))
+ return true;