#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 "discover-server.h"
+#include "event.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;
struct list contexts;
};
-struct mount_map {
- char *device_path;
- char *mount_point;
-};
-
/**
* device_handler_add - Add a device to the handler device array.
*/
if (handler->devices[i] == device)
break;
- if (i < handler->n_devices) {
+ if (i == handler->n_devices) {
assert(0 && "unknown device");
return;
}
&& streq(handler->devices[i]->id, id))
return handler->devices[i];
- assert(0 && "unknown device");
+ pb_log("%s: unknown device: %s\n", __func__, id);
return NULL;
}
char *enc, *dir, *path;
const char *value;
- value = udev_event_param(ctx->event, link->env);
+ value = event_get_param(ctx->event, link->env);
if (!value || !*value)
continue;
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";
argv[4] = "ro";
argv[5] = NULL;
- if (pb_run_cmd(argv))
- goto out_rmdir;
+ if (pb_run_cmd(argv, 1, 0)) {
+
+ /* Retry mount without ro option. */
+
+ argv[0] = pb_system_apps.mount;
+ argv[1] = ctx->device_path;
+ argv[2] = ctx->mount_path;
+ argv[3] = NULL;
+
+ if (pb_run_cmd(argv, 1, 0))
+ goto out_rmdir;
+ }
setup_device_links(ctx);
return 0;
}
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);
}
return 0;
}
-static int handle_add_event(struct device_handler *handler,
- struct udev_event *event)
+static int handle_add_udev_event(struct device_handler *handler,
+ struct event *event)
{
struct discover_context *ctx;
const char *devname;
ctx->id = talloc_strdup(ctx, event->device);
- devname = udev_event_param(ctx->event, "DEVNAME");
- if (!devname) {
- pb_log("no devname for %s?\n", event->device);
- return 0;
- }
-
+ devname = event_get_param(ctx->event, "DEVNAME");
+ assert(devname);
ctx->device_path = talloc_strdup(ctx, devname);
rc = mount_device(ctx);
return 0;
}
-static int handle_remove_event(struct device_handler *handler,
- struct udev_event *event)
+static int handle_remove_udev_event(struct device_handler *handler,
+ struct event *event)
{
struct discover_context *ctx;
return 0;
}
-int device_handler_event(struct device_handler *handler,
- struct udev_event *event)
+static int handle_add_user_event(struct device_handler *handler,
+ struct event *event)
{
- int rc;
+ struct device *device;
+
+ assert(event->device);
+
+ device = talloc_zero(handler, struct device);
+
+ if (!device)
+ goto fail;
+
+ device->id = talloc_strdup(device, event->device);
+ list_init(&device->boot_options);
+
+ parse_user_event(device, event);
+
+ discover_server_notify_add(handler->server, device);
+
+ /* add device to handler device array */
+ device_handler_add(handler, device);
+
+ return 0;
+
+fail:
+ talloc_free(device);
+ return 0;
+}
+
+static int handle_remove_user_event(struct device_handler *handler,
+ struct event *event)
+{
+ struct device *device = device_handler_find(handler, event->device);
- switch (event->action) {
- case UDEV_ACTION_ADD:
- rc = handle_add_event(handler, event);
- break;
+ if (!device)
+ return 0;
+
+ discover_server_notify_remove(handler->server, device);
+
+ /* remove device from handler device array */
+ device_handler_remove(handler, device);
+
+ talloc_free(device);
+ return 0;
+}
- case UDEV_ACTION_REMOVE:
- rc = handle_remove_event(handler, event);
- break;
+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,
+ }
+};
+
+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 rc;
+ 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);
+}
projects / petitboot / blobdiff