#include <talloc/talloc.h>
#include <list/list.h>
#include <log/log.h>
-#include <pb-protocol/pb-protocol.h>
+#include <types/types.h>
#include <system/system.h>
#include "device-handler.h"
#include "parser.h"
#include "udev.h"
#include "paths.h"
-
-#define MOUNT_BIN "/bin/mount"
-
-#define UMOUNT_BIN "/bin/umount"
+#include "boot.h"
struct device_handler {
struct discover_server *server;
+ int dry_run;
struct device **devices;
unsigned int n_devices;
pb_log("couldn't create mount directory %s: %s\n",
ctx->mount_path, strerror(errno));
- argv[0] = MOUNT_BIN;
+ argv[0] = pb_system_apps.mount;
argv[1] = ctx->device_path;
argv[2] = ctx->mount_path;
argv[3] = "-o";
/* Retry mount without ro option. */
- argv[0] = MOUNT_BIN;
+ argv[0] = pb_system_apps.mount;
argv[1] = ctx->device_path;
argv[2] = ctx->mount_path;
argv[3] = NULL;
}
if (pid == 0) {
- execl(UMOUNT_BIN, UMOUNT_BIN, ctx->mount_path, NULL);
+ execl(pb_system_apps.umount, pb_system_apps.umount,
+ ctx->mount_path, NULL);
exit(EXIT_FAILURE);
}
struct event *event)
{
struct discover_context *ctx;
+ struct boot_option *opt;
const char *devname;
int rc;
/* add device to handler device array */
device_handler_add(handler, ctx->device);
- discover_server_notify_add(handler->server, ctx->device);
+ discover_server_notify_device_add(handler->server, ctx->device);
+
+ list_for_each_entry(&ctx->device->boot_options, opt, list)
+ discover_server_notify_boot_option_add(handler->server, opt);
return 0;
}
if (!ctx)
return 0;
- discover_server_notify_remove(handler->server, ctx->device);
+ discover_server_notify_device_remove(handler->server, ctx->device);
/* remove device from handler device array */
device_handler_remove(handler, ctx->device);
static int handle_add_user_event(struct device_handler *handler,
struct event *event)
{
+ struct boot_option *opt;
struct device *device;
assert(event->device);
- device = talloc_zero(handler, struct device);
+ device = device_handler_find(handler, event->device);
- if (!device)
- goto fail;
+ if (!device) {
+ device = talloc_zero(handler, struct device);
- device->id = talloc_strdup(device, event->device);
- list_init(&device->boot_options);
+ if (!device)
+ goto fail;
- parse_user_event(device, event);
+ device->id = talloc_strdup(device, event->device);
+ list_init(&device->boot_options);
- discover_server_notify_add(handler->server, device);
+ /* add device to handler device array */
+ device_handler_add(handler, device);
- /* add device to handler device array */
- device_handler_add(handler, device);
+ discover_server_notify_device_add(handler->server, device);
+ }
+
+ opt = parse_user_event(device, event);
+ discover_server_notify_boot_option_add(handler->server, opt);
return 0;
if (!device)
return 0;
- discover_server_notify_remove(handler->server, device);
+ discover_server_notify_device_remove(handler->server, device);
/* remove device from handler device array */
device_handler_remove(handler, device);
return handlers[event->type][event->action](handler, event);
}
-struct device_handler *device_handler_init(struct discover_server *server)
+struct device_handler *device_handler_init(struct discover_server *server,
+ int dry_run)
{
struct device_handler *handler;
handler->devices = NULL;
handler->n_devices = 0;
handler->server = server;
+ handler->dry_run = dry_run;
list_init(&handler->contexts);
{
talloc_free(handler);
}
+
+static struct boot_option *find_boot_option_by_id(
+ struct device_handler *handler, const char *id)
+{
+ unsigned int i;
+
+ for (i = 0; i < handler->n_devices; i++) {
+ struct device *dev = handler->devices[i];
+ struct boot_option *opt;
+
+ list_for_each_entry(&dev->boot_options, opt, list)
+ if (!strcmp(opt->id, id))
+ return opt;
+ }
+
+ return NULL;
+}
+
+void device_handler_boot(struct device_handler *handler,
+ struct boot_command *cmd)
+{
+ struct boot_option *opt;
+
+ opt = find_boot_option_by_id(handler, cmd->option_id);
+
+ boot(handler, opt, cmd, handler->dry_run);
+}