X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=e4978faaffd13d4a0c3545d10caf54955062b5c2;hp=80187ff49474a186cfb5b7e5bb7bceb0f4209404;hb=d2b12ddb905a74fa6b2e454142b0b9f71fd99398;hpb=dedff99aae78a8af387e39fb0c5d3518689ee328

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 80187ff..e4978fa 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -7,6 +7,7 @@
 #include <mntent.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <sys/mount.h>
 
 #include <talloc/talloc.h>
 #include <list/list.h>
@@ -18,6 +19,7 @@
 
 #include "device-handler.h"
 #include "discover-server.h"
+#include "user-event.h"
 #include "platform.h"
 #include "event.h"
 #include "parser.h"
@@ -25,11 +27,17 @@
 #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;
 
@@ -48,6 +56,9 @@ struct device_handler {
 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)
 {
@@ -259,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;
@@ -273,9 +285,43 @@ struct device_handler *device_handler_init(struct discover_server *server,
 
 	parser_init();
 
+	if (config_get()->safe_mode)
+		return handler;
+
+	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)
 {
@@ -301,6 +347,11 @@ void device_handler_remove(struct device_handler *handler,
 		talloc_free(opt);
 	}
 
+	/* if this is a network device, we have to unregister it from the
+	 * network code */
+	if (device->device->type == DEVICE_TYPE_NETWORK)
+		network_unregister_device(handler->network, device);
+
 	handler->n_devices--;
 	memmove(&handler->devices[i], &handler->devices[i + 1],
 		(handler->n_devices - i) * sizeof(handler->devices[0]));
@@ -330,7 +381,7 @@ static void countdown_status(struct device_handler *handler,
 	status.progress = -1;
 	status.detail = NULL;
 	status.message = talloc_asprintf(handler,
-			"Booting %s in %u sec", opt->option->name, sec);
+			"Booting in %d sec: %s", sec, opt->option->name);
 
 	discover_server_notify_boot_status(handler->server, &status);
 
@@ -393,6 +444,22 @@ static int default_option_priority(struct discover_boot_option *opt)
 	return 0;
 }
 
+static bool device_allows_default(struct discover_device *dev)
+{
+	const char *dev_str;
+
+	dev_str = config_get()->boot_device;
+
+	if (!dev_str || !strlen(dev_str))
+		return true;
+
+	/* default devices are specified by UUIDs at present */
+	if (strcmp(dev->uuid, dev_str))
+		return false;
+
+	return true;
+}
+
 static void set_default(struct device_handler *handler,
 		struct discover_boot_option *opt)
 {
@@ -401,6 +468,10 @@ static void set_default(struct device_handler *handler,
 	if (!handler->autoboot_enabled)
 		return;
 
+	/* do we allow default-booting from this device? */
+	if (!device_allows_default(opt->device))
+		return;
+
 	new_prio = default_option_priority(opt);
 
 	/* A negative priority indicates that we don't want to boot this device
@@ -603,6 +674,8 @@ void device_handler_add_device(struct device_handler *handler,
 				struct discover_device *, handler->n_devices);
 	handler->devices[handler->n_devices - 1] = device;
 
+	if (device->device->type == DEVICE_TYPE_NETWORK)
+		network_register_device(handler->network, device);
 }
 
 /* Start discovery on a hotplugged device. The device will be in our devices
@@ -746,9 +819,46 @@ void device_handler_update_config(struct device_handler *handler,
 {
 	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)
+{
+	/* if we haven't initialised sources previously (becuase we started in
+	 * safe mode), then init once here. */
+	if (!(handler->udev || handler->network || handler->user_event)) {
+		device_handler_init_sources(handler);
+		return;
+	}
+
+	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;
@@ -806,6 +916,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)
@@ -817,6 +928,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);
 
@@ -826,9 +941,10 @@ 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;
@@ -836,8 +952,8 @@ static int mount_device(struct discover_device *dev)
 		return 0;
 	}
 
-	pb_log("couldn't mount device %s: mount failed with rc %d\n",
-			dev->device_path, rc);
+	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:
@@ -848,15 +964,14 @@ 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;
@@ -881,8 +996,9 @@ int device_request_write(struct discover_device *dev, bool *release)
 	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;
 
@@ -896,13 +1012,25 @@ void device_release_write(struct discover_device *dev, bool release)
 	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;