X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=dd3aee92ca35d0385880b190f60a379494152ad8;hp=cd9c41386ea07bdaa9762f75ac3ec81648c5b280;hb=ae3c354e844698bdb4ed35a6845aa9dca1e9205f;hpb=b201464a18c990ea6df0f2878e532618d4936c53

diff --git a/discover/device-handler.c b/discover/device-handler.c
index cd9c413..dd3aee9 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -1,4 +1,3 @@
-
 #include <assert.h>
 #include <stdlib.h>
 #include <stdbool.h>
@@ -8,8 +7,8 @@
 #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>
@@ -20,16 +19,25 @@
 
 #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;
 
@@ -40,11 +48,17 @@ struct device_handler {
 
 	struct discover_boot_option *default_boot_option;
 	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);
+
 void discover_context_add_boot_option(struct discover_context *ctx,
 		struct discover_boot_option *boot_option)
 {
@@ -247,7 +261,7 @@ const char *discover_device_get_param(struct discover_device *device,
 
 	list_for_each_entry(&device->params, param, list) {
 		if (!strcmp(param->name, name))
-			return param->name;
+			return param->value;
 	}
 	return NULL;
 }
@@ -256,6 +270,7 @@ struct device_handler *device_handler_init(struct discover_server *server,
 		struct waitset *waitset, int dry_run)
 {
 	struct device_handler *handler;
+	int rc;
 
 	handler = talloc_zero(NULL, struct device_handler);
 	handler->server = server;
@@ -270,12 +285,44 @@ struct device_handler *device_handler_init(struct discover_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++)
@@ -287,6 +334,16 @@ void device_handler_remove(struct device_handler *handler,
 		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]));
@@ -331,6 +388,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) {
@@ -346,50 +406,60 @@ static int default_timeout(void *arg)
 
 	pb_log("Timeout expired, booting default option %s\n", opt->option->id);
 
-	boot(handler, handler->default_boot_option, NULL,
-			handler->dry_run, boot_status, handler);
+	handler->pending_boot = boot(handler, handler->default_boot_option,
+			NULL, handler->dry_run, boot_status, handler);
+	handler->pending_boot_is_default = true;
 	return 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 */
@@ -433,7 +503,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);
 
@@ -495,13 +565,13 @@ 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);
@@ -517,9 +587,8 @@ struct discover_context *device_handler_discover_context_create(
 {
 	struct discover_context *ctx;
 
-	ctx = talloc(handler, struct discover_context);
+	ctx = talloc_zero(handler, struct discover_context);
 	ctx->device = device;
-	ctx->conf_url = NULL;
 	list_init(&ctx->boot_options);
 
 	return ctx;
@@ -583,40 +652,47 @@ void device_handler_add_device(struct device_handler *handler,
  * 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;
 
 	process_boot_option_queue(handler);
 
 	/* create our context */
 	ctx = device_handler_discover_context_create(handler, dev);
 
-	mount_device(dev);
+	rc = mount_device(dev);
+	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);
 
+out:
 	talloc_free(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);
 
@@ -625,6 +701,25 @@ int device_handler_conf(struct device_handler *handler,
 	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)
 {
@@ -645,11 +740,16 @@ static struct discover_boot_option *find_boot_option_by_id(
 void device_handler_boot(struct device_handler *handler,
 		struct boot_command *cmd)
 {
-	struct discover_boot_option *opt;
+	struct discover_boot_option *opt = NULL;
 
-	opt = find_boot_option_by_id(handler, cmd->option_id);
+	if (cmd->option_id && strlen(cmd->option_id))
+		opt = find_boot_option_by_id(handler, cmd->option_id);
 
-	boot(handler, opt, cmd, handler->dry_run, boot_status, handler);
+	if (handler->pending_boot)
+		boot_cancel(handler->pending_boot);
+	handler->pending_boot = boot(handler, opt, cmd, handler->dry_run,
+			boot_status, handler);
+	handler->pending_boot_is_default = false;
 }
 
 void device_handler_cancel_default(struct device_handler *handler)
@@ -668,6 +768,12 @@ void device_handler_cancel_default(struct device_handler *handler)
 
 	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;
+	}
+
 	handler->default_boot_option = NULL;
 
 	status.type = BOOT_STATUS_INFO;
@@ -678,7 +784,44 @@ void device_handler_cancel_default(struct device_handler *handler)
 	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;
@@ -716,12 +859,15 @@ static bool check_existing_mount(struct discover_device *dev)
 			continue;
 
 		if (mntstat.st_rdev == devstat.st_rdev) {
-			pb_debug("%s: %s is already mounted at %s\n"
-					__func__, dev->device_path,
-					mnt->mnt_dir);
 			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;
 		}
 	}
@@ -733,6 +879,7 @@ static bool check_existing_mount(struct discover_device *dev)
 
 static int mount_device(struct discover_device *dev)
 {
+	const char *fstype;
 	int rc;
 
 	if (!dev->device_path)
@@ -744,6 +891,10 @@ static int mount_device(struct discover_device *dev)
 	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);
 
@@ -753,24 +904,19 @@ static int mount_device(struct discover_device *dev)
 		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;
 		dev->unmount = true;
 		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->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:
@@ -781,27 +927,73 @@ 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;
+
+	pb_rmdir_recursive(mount_base(), dev->mount_path);
+
 	talloc_free(dev->mount_path);
 	dev->mount_path = NULL;
 
-	pb_rmdir_recursive(mount_base(), dev->mount_path);
+	return 0;
+}
+
+int device_request_write(struct discover_device *dev, bool *release)
+{
+	int rc;
+
+	*release = false;
+
+	if (!dev->mounted)
+		return -1;
+
+	if (dev->mounted_rw)
+		return 0;
+
+	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;
 
+	dev->mounted_rw = true;
+	*release = true;
 	return 0;
 }
+
+void device_release_write(struct discover_device *dev, bool release)
+{
+	if (!release)
+		return;
+
+	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;
@@ -813,5 +1005,17 @@ static int __attribute__((unused)) mount_device(
 	return 0;
 }
 
+int device_request_write(struct discover_device *dev __attribute__((unused)),
+		bool *release)
+{
+	*release = true;
+	return 0;
+}
+
+void device_release_write(struct discover_device *dev __attribute__((unused)),
+	bool release __attribute__((unused)))
+{
+}
+
 #endif