X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=54a19865d2bb2e061e179afcdb9d8b6a84287b30;hp=77f9e3c59b9bb761d02a668f26ad130187f516d9;hb=e2c92865481a5fb043c03c0cde625a96ca608699;hpb=d9fc4558e66c32834f2a4fdab31010b40f0a88de

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 77f9e3c..54a1986 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -359,6 +359,15 @@ void device_handler_remove(struct device_handler *handler,
 	struct discover_boot_option *opt, *tmp;
 	unsigned int i;
 
+	list_for_each_entry_safe(&device->boot_options, opt, tmp, list) {
+		if (opt == handler->default_boot_option) {
+			pb_log("Default option %s cancelled since device removed",
+					opt->option->name);
+			device_handler_cancel_default(handler);
+			break;
+		}
+	}
+
 	for (i = 0; i < handler->n_devices; i++)
 		if (handler->devices[i] == device)
 			break;
@@ -396,7 +405,7 @@ void device_handler_remove(struct device_handler *handler,
 	talloc_free(device);
 }
 
-static void boot_status(void *arg, struct boot_status *status)
+void device_handler_boot_status(void *arg, struct boot_status *status)
 {
 	struct device_handler *handler = arg;
 
@@ -445,8 +454,11 @@ static int default_timeout(void *arg)
 
 	pb_log("Timeout expired, booting default option %s\n", opt->option->id);
 
+	platform_pre_boot();
+
 	handler->pending_boot = boot(handler, handler->default_boot_option,
-			NULL, handler->dry_run, boot_status, handler);
+			NULL, handler->dry_run, device_handler_boot_status,
+			handler);
 	handler->pending_boot_is_default = true;
 	return 0;
 }
@@ -601,6 +613,7 @@ static bool __attribute__((used)) boot_option_is_resolved(
 	return resource_is_resolved(opt->boot_image) &&
 		resource_is_resolved(opt->initrd) &&
 		resource_is_resolved(opt->dtb) &&
+		resource_is_resolved(opt->args_sig_file) &&
 		resource_is_resolved(opt->icon);
 }
 
@@ -626,6 +639,8 @@ static bool boot_option_resolve(struct discover_boot_option *opt,
 	return resource_resolve(opt->boot_image, "boot_image", opt, handler) &&
 		resource_resolve(opt->initrd, "initrd", opt, handler) &&
 		resource_resolve(opt->dtb, "dtb", opt, handler) &&
+		resource_resolve(opt->args_sig_file, "args_sig_file", opt,
+			handler) &&
 		resource_resolve(opt->icon, "icon", opt, handler);
 }
 
@@ -640,6 +655,7 @@ static void boot_option_finalise(struct device_handler *handler,
 	assert(!opt->option->dtb_file);
 	assert(!opt->option->icon_file);
 	assert(!opt->option->device_id);
+	assert(!opt->option->args_sig_file);
 
 	if (opt->boot_image)
 		opt->option->boot_image_file = opt->boot_image->url->full;
@@ -649,6 +665,8 @@ static void boot_option_finalise(struct device_handler *handler,
 		opt->option->dtb_file = opt->dtb->url->full;
 	if (opt->icon)
 		opt->option->icon_file = opt->icon->url->full;
+	if (opt->args_sig_file)
+		opt->option->args_sig_file = opt->args_sig_file->url->full;
 
 	opt->option->device_id = opt->device->device->id;
 
@@ -705,50 +723,6 @@ struct discover_context *device_handler_discover_context_create(
 	return ctx;
 }
 
-/**
- * context_commit - Commit a temporary discovery context to the handler,
- * and notify the clients about any new options / devices
- */
-void device_handler_discover_context_commit(struct device_handler *handler,
-		struct discover_context *ctx)
-{
-	struct discover_device *dev = ctx->device;
-	struct discover_boot_option *opt, *tmp;
-
-	if (!device_lookup_by_id(handler, dev->device->id))
-		device_handler_add_device(handler, dev);
-
-	/* move boot options from the context to the device */
-	list_for_each_entry_safe(&ctx->boot_options, opt, tmp, list) {
-		list_remove(&opt->list);
-
-		if (boot_option_resolve(opt, handler)) {
-			pb_log("boot option %s is resolved, "
-					"sending to clients\n",
-					opt->option->id);
-			list_add_tail(&dev->boot_options, &opt->list);
-			talloc_steal(dev, opt);
-			boot_option_finalise(handler, opt);
-			notify_boot_option(handler, opt);
-		} else {
-			if (!opt->source->resolve_resource) {
-				pb_log("parser %s gave us an unresolved "
-					"resource (%s), but no way to "
-					"resolve it\n",
-					opt->source->name, opt->option->id);
-				talloc_free(opt);
-			} else {
-				pb_log("boot option %s is unresolved, "
-						"adding to queue\n",
-						opt->option->id);
-				list_add(&handler->unresolved_boot_options,
-						&opt->list);
-				talloc_steal(handler, opt);
-			}
-		}
-	}
-}
-
 void device_handler_add_device(struct device_handler *handler,
 		struct discover_device *device)
 {
@@ -871,7 +845,7 @@ int device_handler_discover(struct device_handler *handler,
 	status->message = talloc_asprintf(status, _("Processing %s device %s"),
 				device_type_display_name(dev->device->type),
 				dev->device->id);
-	boot_status(handler, status);
+	device_handler_boot_status(handler, status);
 
 	process_boot_option_queue(handler);
 
@@ -899,10 +873,10 @@ out:
 	 */
 	status->message = talloc_asprintf(status,_("Processing %s complete"),
 				dev->device->id);
-	boot_status(handler, status);
+	device_handler_boot_status(handler, status);
 
 	talloc_free(status);
-	talloc_free(ctx);
+	talloc_unlink(handler, ctx);
 
 	return 0;
 }
@@ -922,10 +896,11 @@ int device_handler_dhcp(struct device_handler *handler,
 	 */
 	status->message = talloc_asprintf(status, _("Processing dhcp event on %s"),
 				dev->device->id);
-	boot_status(handler, status);
+	device_handler_boot_status(handler, status);
 
 	/* create our context */
 	ctx = device_handler_discover_context_create(handler, dev);
+	talloc_steal(ctx, event);
 	ctx->event = event;
 
 	iterate_parsers(ctx);
@@ -938,40 +913,10 @@ int device_handler_dhcp(struct device_handler *handler,
 	 */
 	status->message = talloc_asprintf(status,_("Processing %s complete"),
 				dev->device->id);
-	boot_status(handler, status);
-
-	talloc_free(status);
-	talloc_free(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;
-	struct boot_status *status;
-
-	status = talloc_zero(handler, struct boot_status);
-	status->type = BOOT_STATUS_INFO;
-	status->message = talloc_asprintf(status, _("Processing user config"));
-	boot_status(handler, status);
-
-	/* 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);
-
-	status->message = talloc_asprintf(status,
-				_("Processing user config complete"));
-	boot_status(handler, status);
+	device_handler_boot_status(handler, status);
 
 	talloc_free(status);
-	talloc_free(ctx);
+	talloc_unlink(handler, ctx);
 
 	return 0;
 }
@@ -1007,7 +952,7 @@ void device_handler_boot(struct device_handler *handler,
 	platform_pre_boot();
 
 	handler->pending_boot = boot(handler, opt, cmd, handler->dry_run,
-			boot_status, handler);
+			device_handler_boot_status, handler);
 	handler->pending_boot_is_default = false;
 }
 
@@ -1099,10 +1044,12 @@ static char *device_from_addr(void *ctx, struct pb_url *url)
 
 	rc = process_run_sync(p);
 
-	if (rc) {
+	if (rc || p->exit_status) {
 		/* ip has complained for some reason; most likely
 		 * there is no route to the host - bail out */
-		pb_debug("%s: No route to %s\n",__func__,url->host);
+		pb_debug("%s: `ip` returns non-zero exit status\n", __func__);
+		pb_debug("ip buf: %s\n", p->stdout_buf);
+		process_release(p);
 		return NULL;
 	}
 
@@ -1150,7 +1097,7 @@ void device_handler_process_url(struct device_handler *handler,
 
 	event = talloc(handler, struct event);
 	event->type = EVENT_TYPE_USER;
-	event->action = EVENT_ACTION_CONF;
+	event->action = EVENT_ACTION_URL;
 
 	if (url[strlen(url) - 1] == '/') {
 		event->params = talloc_array(event, struct param, 3);
@@ -1173,13 +1120,17 @@ void device_handler_process_url(struct device_handler *handler,
 	}
 
 	pb_url = pb_url_parse(event, event->params->value);
-	if (!pb_url || !pb_url->host) {
+	if (!pb_url || (pb_url->scheme != pb_url_file && !pb_url->host)) {
 		status->message = talloc_asprintf(handler,
 					_("Invalid config URL!"));
 		goto msg;
 	}
 
-	event->device = device_from_addr(event, pb_url);
+	if (pb_url->scheme == pb_url_file)
+		event->device = talloc_asprintf(event, "local");
+	else
+		event->device = device_from_addr(event, pb_url);
+
 	if (!event->device) {
 		status->message = talloc_asprintf(status,
 					_("Unable to route to host %s"),
@@ -1188,25 +1139,80 @@ void device_handler_process_url(struct device_handler *handler,
 	}
 
 	dev = discover_device_create(handler, event->device);
+	if (pb_url->scheme == pb_url_file)
+		dev->device->type = DEVICE_TYPE_ANY;
 	ctx = device_handler_discover_context_create(handler, dev);
+	talloc_steal(ctx, event);
 	ctx->event = event;
 
 	iterate_parsers(ctx);
 
 	device_handler_discover_context_commit(handler, ctx);
 
-	talloc_free(ctx);
+	talloc_unlink(handler, ctx);
 
 	status->type = BOOT_STATUS_INFO;
 	status->message = talloc_asprintf(status, _("Config file %s parsed"),
 					pb_url->file);
 msg:
-	boot_status(handler, status);
+	device_handler_boot_status(handler, status);
 	talloc_free(status);
 }
 
 #ifndef PETITBOOT_TEST
 
+/**
+ * context_commit - Commit a temporary discovery context to the handler,
+ * and notify the clients about any new options / devices
+ */
+void device_handler_discover_context_commit(struct device_handler *handler,
+		struct discover_context *ctx)
+{
+	struct discover_device *dev = ctx->device;
+	struct discover_boot_option *opt, *tmp;
+
+	if (!device_lookup_by_id(handler, dev->device->id))
+		device_handler_add_device(handler, dev);
+
+	/* move boot options from the context to the device */
+	list_for_each_entry_safe(&ctx->boot_options, opt, tmp, list) {
+		list_remove(&opt->list);
+
+		/* All boot options need at least a kernel image */
+		if (!opt->boot_image || !opt->boot_image->url) {
+			pb_log("boot option %s is missing boot image, ignoring\n",
+				opt->option->id);
+			talloc_free(opt);
+			continue;
+		}
+
+		if (boot_option_resolve(opt, handler)) {
+			pb_log("boot option %s is resolved, "
+					"sending to clients\n",
+					opt->option->id);
+			list_add_tail(&dev->boot_options, &opt->list);
+			talloc_steal(dev, opt);
+			boot_option_finalise(handler, opt);
+			notify_boot_option(handler, opt);
+		} else {
+			if (!opt->source->resolve_resource) {
+				pb_log("parser %s gave us an unresolved "
+					"resource (%s), but no way to "
+					"resolve it\n",
+					opt->source->name, opt->option->id);
+				talloc_free(opt);
+			} else {
+				pb_log("boot option %s is unresolved, "
+						"adding to queue\n",
+						opt->option->id);
+				list_add(&handler->unresolved_boot_options,
+						&opt->list);
+				talloc_steal(handler, opt);
+			}
+		}
+	}
+}
+
 static void device_handler_update_lang(const char *lang)
 {
 	const char *cur_lang;
@@ -1256,30 +1262,6 @@ static void device_handler_reinit_sources(struct device_handler *handler)
 			handler->dry_run);
 }
 
-static const char *fs_parameters(struct discover_device *dev,
-				 unsigned int rw_flags)
-{
-	const char *fstype = discover_device_get_param(dev, "ID_FS_TYPE");
-
-	/* XFS journals are not cross-endian compatible; don't try recovery
-	 * even if we have a snapshot */
-	if (!strncmp(fstype, "xfs", strlen("xfs")))
-		return "norecovery";
-
-	/* If we have a snapshot available allow touching the filesystem */
-	if (dev->ramdisk)
-		return "";
-
-	if ((rw_flags | MS_RDONLY) != MS_RDONLY)
-		return "";
-
-	/* Avoid writes due to journal replay if we don't have a snapshot */
-	if (!strncmp(fstype, "ext4", strlen("ext4")))
-		return "norecovery";
-
-	return "";
-}
-
 static inline const char *get_device_path(struct discover_device *dev)
 {
 	return dev->ramdisk ? dev->ramdisk->snapshot : dev->device_path;
@@ -1366,6 +1348,52 @@ static bool check_existing_mount(struct discover_device *dev)
 	return mnt != NULL;
 }
 
+/*
+ * Attempt to mount a filesystem safely, while handling certain filesytem-
+ * specific options
+ */
+static int try_mount(const char *device_path, const char *mount_path,
+			     const char *fstype, unsigned long flags,
+			     bool have_snapshot)
+{
+	const char *fs, *safe_opts;
+	int rc;
+
+	/* Mount ext3 as ext4 instead so 'norecovery' can be used */
+	if (strncmp(fstype, "ext3", strlen("ext3")) == 0) {
+		pb_debug("Mounting ext3 filesystem as ext4\n");
+		fs = "ext4";
+	} else
+		fs = fstype;
+
+	if (strncmp(fs, "xfs", strlen("xfs")) == 0 ||
+	    strncmp(fs, "ext4", strlen("ext4")) == 0)
+		safe_opts = "norecovery";
+	else
+		safe_opts = NULL;
+
+	errno = 0;
+	/* If no snapshot is available don't attempt recovery */
+	if (!have_snapshot)
+		return mount(device_path, mount_path, fs, flags, safe_opts);
+
+	rc = mount(device_path, mount_path, fs, flags, NULL);
+
+	if (!rc)
+		return rc;
+
+	/* Mounting failed; some filesystems will fail to mount if a recovery
+	 * journal exists (eg. cross-endian XFS), so try again with norecovery
+	 * where that option is available.
+	 * If mounting read-write just return the error as norecovery is not a
+	 * valid option */
+	if ((flags & MS_RDONLY) != MS_RDONLY || !safe_opts)
+		return rc;
+
+	errno = 0;
+	return mount(device_path, mount_path, fs, flags, safe_opts);
+}
+
 static int mount_device(struct discover_device *dev)
 {
 	const char *fstype, *device_path;
@@ -1384,13 +1412,6 @@ static int mount_device(struct discover_device *dev)
 	if (!fstype)
 		return 0;
 
-	/* ext3 treats the norecovery option as an error, so mount the device
-	 * as an ext4 filesystem instead */
-	if (!strncmp(fstype, "ext3", strlen("ext3"))) {
-		pb_debug("Mounting ext3 filesystem as ext4\n");
-		fstype = talloc_asprintf(dev, "ext4");
-	}
-
 	dev->mount_path = join_paths(dev, mount_base(),
 					dev->device_path);
 
@@ -1403,10 +1424,9 @@ static int mount_device(struct discover_device *dev)
 	device_path = get_device_path(dev);
 
 	pb_log("mounting device %s read-only\n", dev->device_path);
-	errno = 0;
-	rc = mount(device_path, dev->mount_path, fstype,
-			MS_RDONLY | MS_SILENT,
-			fs_parameters(dev, MS_RDONLY));
+	rc = try_mount(device_path, dev->mount_path, fstype,
+		       MS_RDONLY | MS_SILENT, dev->ramdisk);
+
 	if (!rc) {
 		dev->mounted = true;
 		dev->mounted_rw = false;
@@ -1486,9 +1506,8 @@ int device_request_write(struct discover_device *dev, bool *release)
 		return -1;
 	}
 
-	rc = mount(device_path, dev->mount_path, fstype,
-			MS_SILENT,
-			fs_parameters(dev, MS_REMOUNT));
+	rc = try_mount(device_path, dev->mount_path, fstype,
+		       MS_SILENT, dev->ramdisk);
 	if (rc)
 		goto mount_ro;
 
@@ -1499,9 +1518,9 @@ int device_request_write(struct discover_device *dev, bool *release)
 mount_ro:
 	pb_log("Unable to remount device %s read-write: %s\n",
 	       device_path, strerror(errno));
-	if (mount(device_path, dev->mount_path, fstype,
-			MS_RDONLY | MS_SILENT,
-			fs_parameters(dev, MS_RDONLY)))
+	rc = try_mount(device_path, dev->mount_path, fstype,
+		       MS_RDONLY | MS_SILENT, dev->ramdisk);
+	if (rc)
 		pb_log("Unable to recover mount for %s: %s\n",
 		       device_path, strerror(errno));
 	return -1;
@@ -1532,17 +1551,58 @@ void device_release_write(struct discover_device *dev, bool release)
 		device_path = get_device_path(dev);
 	}
 
-	if (mount(device_path, dev->mount_path, fstype,
-			MS_RDONLY | MS_SILENT,
-			fs_parameters(dev, MS_RDONLY)))
+	if (try_mount(device_path, dev->mount_path, fstype,
+		       MS_RDONLY | MS_SILENT, dev->ramdisk))
 		pb_log("Failed to remount %s read-only: %s\n",
 		       device_path, strerror(errno));
 	else
 		dev->mounted = true;
 }
 
+void device_sync_snapshots(struct device_handler *handler, const char *device)
+{
+	struct discover_device *dev = NULL;
+	unsigned int i;
+
+	if (device) {
+		/* Find matching device and sync */
+		dev = device_lookup_by_name(handler, device);
+		if (!dev) {
+			pb_log("%s: device name '%s' unrecognised\n",
+				__func__, device);
+			return;
+		}
+		if (dev->ramdisk)
+			device_release_write(dev, true);
+		else
+			pb_log("%s has no snapshot to merge, skipping\n",
+				dev->device->id);
+		return;
+	}
+
+	/* Otherwise sync all relevant devices */
+	for (i = 0; i < handler->n_devices; i++) {
+		dev = handler->devices[i];
+		if (dev->device->type != DEVICE_TYPE_DISK &&
+			dev->device->type != DEVICE_TYPE_USB)
+			continue;
+		if (dev->ramdisk)
+			device_release_write(dev, true);
+		else
+			pb_log("%s has no snapshot to merge, skipping\n",
+				dev->device->id);
+	}
+}
+
 #else
 
+void device_handler_discover_context_commit(
+		struct device_handler *handler __attribute__((unused)),
+		struct discover_context *ctx __attribute__((unused)))
+{
+	pb_log("%s stubbed out for test cases\n", __func__);
+}
+
 static void device_handler_update_lang(const char *lang __attribute__((unused)))
 {
 }
@@ -1581,5 +1641,10 @@ void device_release_write(struct discover_device *dev __attribute__((unused)),
 {
 }
 
-#endif
+void device_sync_snapshots(
+		struct device_handler *handler __attribute__((unused)),
+		const char *device __attribute__((unused)))
+{
+}
 
+#endif