X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=142f6a490028508056415ab99e78f020f035b309;hp=cd9c41386ea07bdaa9762f75ac3ec81648c5b280;hb=769fd76dc9bf3440999297ab943af49160df9c45;hpb=b201464a18c990ea6df0f2878e532618d4936c53

diff --git a/discover/device-handler.c b/discover/device-handler.c
index cd9c413..142f6a4 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -520,6 +520,7 @@ struct discover_context *device_handler_discover_context_create(
 	ctx = talloc(handler, struct discover_context);
 	ctx->device = device;
 	ctx->conf_url = NULL;
+	ctx->test_data = NULL;
 	list_init(&ctx->boot_options);
 
 	return ctx;
@@ -586,13 +587,16 @@ int device_handler_discover(struct device_handler *handler,
 		struct discover_device *dev, enum conf_method method)
 {
 	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;
 
 	/* run the parsers. This will populate the ctx's boot_option list. */
 	iterate_parsers(ctx, method);
@@ -600,6 +604,7 @@ int device_handler_discover(struct device_handler *handler,
 	/* add discovered stuff to the handler */
 	device_handler_discover_context_commit(handler, ctx);
 
+out:
 	talloc_free(ctx);
 
 	return 0;
@@ -645,9 +650,10 @@ 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);
 }
@@ -716,12 +722,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;
 		}
 	}
@@ -758,6 +767,7 @@ static int mount_device(struct discover_device *dev)
 			"-o", "ro", NULL);
 	if (!rc) {
 		dev->mounted = true;
+		dev->mounted_rw = false;
 		dev->unmount = true;
 		return 0;
 	}
@@ -768,6 +778,7 @@ static int mount_device(struct discover_device *dev)
 
 	if (!rc) {
 		dev->mounted = true;
+		dev->mounted_rw = true;
 		dev->unmount = true;
 		return 0;
 	}
@@ -793,13 +804,47 @@ static int umount_device(struct discover_device *dev)
 		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;
+
+	rc = process_run_simple(dev, pb_system_apps.mount, dev->mount_path,
+			"-o", "remount,rw", NULL);
+	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;
+
+	process_run_simple(dev, pb_system_apps.mount, dev->mount_path,
+			"-o", "remount,ro", NULL);
+	dev->mounted_rw = false;
+}
+
 #else
 
 static int umount_device(struct discover_device *dev __attribute__((unused)))
@@ -813,5 +858,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