X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=c661fbe2eb3c5aa9189cb720e5c12e064a296360;hp=89aa67d5e342b66dafdea013b7534e50eed6b089;hb=75b1278f2ab0dad22f393e4a002f797dcb8c8a3b;hpb=397dc244bfdc2a57fc3e8fd191b0ef60c8a4b66b

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 89aa67d..c661fbe 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -37,8 +37,8 @@ static void context_commit(struct device_handler *handler,
 		struct discover_context *ctx)
 {
 	struct discover_device *dev = ctx->device;
-	unsigned int i, existing_device;
-	struct boot_option *opt, *tmp;
+	struct discover_boot_option *opt, *tmp;
+	unsigned int i, existing_device = 0;
 
 	/* do we already have this device? */
 	for (i = 0; i < handler->n_devices; i++) {
@@ -63,14 +63,15 @@ static void context_commit(struct device_handler *handler,
 	/* move boot options from the context to the device */
 	list_for_each_entry_safe(&ctx->boot_options, opt, tmp, list) {
 		list_remove(&opt->list);
-		list_add(&dev->device->boot_options, &opt->list);
-		dev->device->n_options++;
-		discover_server_notify_boot_option_add(handler->server, opt);
+		list_add(&dev->boot_options, &opt->list);
+		talloc_steal(dev, opt);
+		discover_server_notify_boot_option_add(handler->server,
+							opt->option);
 	}
 }
 
 void discover_context_add_boot_option(struct discover_context *ctx,
-		struct boot_option *boot_option)
+		struct discover_boot_option *boot_option)
 {
 	list_add(&ctx->boot_options, &boot_option->list);
 	talloc_steal(ctx, boot_option);
@@ -118,7 +119,7 @@ int device_handler_get_device_count(const struct device_handler *handler)
  * device_handler_get_device - Get a handler device by index.
  */
 
-const struct device *device_handler_get_device(
+const struct discover_device *device_handler_get_device(
 	const struct device_handler *handler, unsigned int index)
 {
 	if (index >= handler->n_devices) {
@@ -126,76 +127,16 @@ const struct device *device_handler_get_device(
 		return NULL;
 	}
 
-	return handler->devices[index]->device;
-}
-
-static void setup_device_links(struct discover_device *dev)
-{
-	struct link {
-		const char *dir, *val;
-	} *link, links[] = {
-		{
-			.dir = "disk/by-uuid",
-			.val = dev->uuid,
-		},
-		{
-			.dir = "disk/by-label",
-			.val = dev->label,
-		},
-		{
-			.dir = NULL
-		}
-	};
-
-	for (link = links; link->dir; link++) {
-		char *enc, *dir, *path;
-
-		if (!link->val || !*link->val)
-			continue;
-
-		enc = encode_label(dev, link->val);
-		dir = join_paths(dev, mount_base(), link->dir);
-		path = join_paths(dev, dir, enc);
-
-		if (!pb_mkdir_recursive(dir)) {
-			unlink(path);
-			if (symlink(dev->mount_path, path)) {
-				pb_log("symlink(%s,%s): %s\n",
-						dev->mount_path, path,
-						strerror(errno));
-				talloc_free(path);
-			} else {
-				int i = dev->n_links++;
-				dev->links = talloc_realloc(dev,
-						dev->links, char *,
-						dev->n_links);
-				dev->links[i] = path;
-			}
-
-		}
-
-		talloc_free(dir);
-		talloc_free(enc);
-	}
-}
-
-static void remove_device_links(struct discover_device *dev)
-{
-	int i;
-
-	for (i = 0; i < dev->n_links; i++)
-		unlink(dev->links[i]);
+	return handler->devices[index];
 }
 
 static int mount_device(struct discover_device *dev)
 {
-	const char *mountpoint;
 	const char *argv[6];
 
-	if (!dev->mount_path) {
-		mountpoint = mountpoint_for_device(dev->device_path);
-		dev->mount_path = talloc_strdup(dev, mountpoint);
-	}
+	if (!dev->mount_path)
+		dev->mount_path = join_paths(dev, mount_base(),
+						dev->device_path);
 
 	if (pb_mkdir_recursive(dev->mount_path))
 		pb_log("couldn't create mount directory %s: %s\n",
@@ -221,7 +162,6 @@ static int mount_device(struct discover_device *dev)
 			goto out_rmdir;
 	}
 
-	setup_device_links(dev);
 	return 0;
 
 out_rmdir:
@@ -234,8 +174,6 @@ static int umount_device(struct discover_device *dev)
 	int status;
 	pid_t pid;
 
-	remove_device_links(dev);
-
 	if (!dev->mount_path)
 		return 0;
 
@@ -303,7 +241,7 @@ static struct discover_device *discover_device_create(
 
 	dev = talloc_zero(ctx, struct discover_device);
 	dev->device = talloc_zero(dev, struct device);
-	list_init(&dev->device->boot_options);
+	list_init(&dev->boot_options);
 
 	devname = event_get_param(ctx->event, "DEVNAME");
 	if (devname)
@@ -316,6 +254,20 @@ static struct discover_device *discover_device_create(
 	return dev;
 }
 
+struct discover_boot_option *discover_boot_option_create(
+		struct discover_context *ctx,
+		struct discover_device *device)
+{
+	struct discover_boot_option *opt;
+
+	opt = talloc_zero(ctx, struct discover_boot_option);
+	opt->option = talloc_zero(opt, struct boot_option);
+	opt->device = device;
+
+	return opt;
+}
+
+
 static int handle_add_udev_event(struct device_handler *handler,
 		struct event *event)
 {
@@ -551,17 +503,17 @@ struct discover_device *device_lookup_by_id(
 	return device_lookup(device_handler, device_match_id, id);
 }
 
-static struct boot_option *find_boot_option_by_id(
+static struct discover_boot_option *find_boot_option_by_id(
 		struct device_handler *handler, const char *id)
 {
 	unsigned int i;
 
 	for (i = 0; i < handler->n_devices; i++) {
 		struct discover_device *dev = handler->devices[i];
-		struct boot_option *opt;
+		struct discover_boot_option *opt;
 
-		list_for_each_entry(&dev->device->boot_options, opt, list)
-			if (!strcmp(opt->id, id))
+		list_for_each_entry(&dev->boot_options, opt, list)
+			if (!strcmp(opt->option->id, id))
 				return opt;
 	}
 
@@ -571,7 +523,7 @@ static struct boot_option *find_boot_option_by_id(
 void device_handler_boot(struct device_handler *handler,
 		struct boot_command *cmd)
 {
-	struct boot_option *opt;
+	struct discover_boot_option *opt;
 
 	opt = find_boot_option_by_id(handler, cmd->option_id);