-
#include <assert.h>
#include <stdlib.h>
#include <stdbool.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 "device-handler.h"
#include "discover-server.h"
+#include "user-event.h"
+#include "platform.h"
#include "event.h"
#include "parser.h"
#include "resource.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;
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)
{
list_for_each_entry(&device->params, param, list) {
if (!strcmp(param->name, name))
- return param->name;
+ return param->value;
}
return NULL;
}
struct waitset *waitset, int dry_run)
{
struct device_handler *handler;
+ int rc;
handler = talloc_zero(NULL, struct device_handler);
handler->server = server;
parser_init();
+ rc = device_handler_init_sources(handler);
+ if (rc) {
+ talloc_free(handler);
+ return NULL;
+ }
+
return handler;
}
+void device_handler_reinit(struct device_handler *handler)
+{
+ struct discover_boot_option *opt, *tmp;
+ unsigned int i;
+
+ device_handler_cancel_default(handler);
+
+ /* 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);
+
+ /* drop all devices */
+ for (i = 0; i < handler->n_devices; i++)
+ discover_server_notify_device_remove(handler->server,
+ handler->devices[i]->device);
+
+ talloc_free(handler->devices);
+ handler->devices = NULL;
+ handler->n_devices = 0;
+
+ device_handler_reinit_sources(handler);
+}
+
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++)
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]));
static bool priority_match(struct boot_priority *prio,
struct discover_boot_option *opt)
{
- return prio->type == opt->device->device->type;
+ 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;
- int i;
+ 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))
- break;
+ return prio->priority;
}
- return i;
+ return 0;
}
static void set_default(struct device_handler *handler,
struct discover_boot_option *opt)
{
+ 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 new_prio, cur_prio;
+ int cur_prio;
- new_prio = default_option_priority(opt);
cur_prio = default_option_priority(
handler->default_boot_option);
- if (new_prio < cur_prio) {
+ if (new_prio > cur_prio) {
handler->default_boot_option = opt;
/* extend the timeout a little, so the user sees some
* indication of the change */
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);
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);
{
struct discover_context *ctx;
- ctx = talloc(handler, struct discover_context);
+ ctx = talloc_zero(handler, struct discover_context);
ctx->device = device;
- ctx->conf_url = NULL;
- ctx->test_data = NULL;
list_init(&ctx->boot_options);
return ctx;
* array, but has only just been initialised by the hotplug source.
*/
int device_handler_discover(struct device_handler *handler,
- struct discover_device *dev, enum conf_method method)
+ struct discover_device *dev)
{
struct discover_context *ctx;
int rc;
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, method);
+ iterate_parsers(ctx);
/* add discovered stuff to the handler */
device_handler_discover_context_commit(handler, ctx);
return 0;
}
-/* incoming conf event */
-int device_handler_conf(struct device_handler *handler,
- struct discover_device *dev, struct pb_url *url,
- enum conf_method method)
+/* Incoming dhcp event */
+int device_handler_dhcp(struct device_handler *handler,
+ struct discover_device *dev, struct event *event)
{
struct discover_context *ctx;
/* create our context */
ctx = device_handler_discover_context_create(handler, dev);
- ctx->conf_url = url;
+ ctx->event = event;
- iterate_parsers(ctx, method);
+ iterate_parsers(ctx);
device_handler_discover_context_commit(handler, ctx);
return 0;
}
+/* incoming conf event */
+int device_handler_conf(struct device_handler *handler,
+ struct discover_device *dev, struct pb_url *url)
+{
+ struct discover_context *ctx;
+
+ /* create our context */
+ ctx = device_handler_discover_context_create(handler, dev);
+ ctx->conf_url = url;
+
+ iterate_parsers(ctx);
+
+ device_handler_discover_context_commit(handler, ctx);
+
+ talloc_free(ctx);
+
+ return 0;
+}
+
static struct discover_boot_option *find_boot_option_by_id(
struct device_handler *handler, const char *id)
{
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;
static int mount_device(struct discover_device *dev)
{
+ const char *fstype;
int rc;
if (!dev->device_path)
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);
goto err_free;
}
- rc = process_run_simple(dev, pb_system_apps.mount,
- dev->device_path, dev->mount_path,
- "-o", "ro", NULL);
+ 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;
return 0;
}
- /* Retry mount without ro option. */
- rc = process_run_simple(dev, pb_system_apps.mount,
- dev->device_path, dev->mount_path, NULL);
-
- if (!rc) {
- dev->mounted = true;
- dev->mounted_rw = true;
- 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:
static int umount_device(struct discover_device *dev)
{
- int status;
+ int rc;
if (!dev->mounted || !dev->unmount)
return 0;
- status = process_run_simple(dev, pb_system_apps.umount,
- dev->mount_path, NULL);
-
- if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
+ pb_log("unmounting device %s\n", dev->device_path);
+ rc = umount(dev->mount_path);
+ if (rc)
return -1;
dev->mounted = false;
if (dev->mounted_rw)
return 0;
- rc = process_run_simple(dev, pb_system_apps.mount, dev->mount_path,
- "-o", "remount,rw", NULL);
+ 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;
if (!release)
return;
- process_run_simple(dev, pb_system_apps.mount, dev->mount_path,
- "-o", "remount,ro", NULL);
+ 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;
projects / petitboot / blobdiff