X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=6a27f15780a5a4ae290e2ddf6d1b95f789dadb02;hp=e65eb61ebc2e353fb4880b4b59260c1f9c969a73;hb=b8122dc9340e2f208220f0c88b4d71f91b78774f;hpb=0fdc5cc3f296db134729fe58e074c20084b99459

diff --git a/discover/device-handler.c b/discover/device-handler.c
index e65eb61..6a27f15 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -10,7 +10,7 @@
 #include <talloc/talloc.h>
 #include <list/list.h>
 #include <log/log.h>
-#include <pb-protocol/pb-protocol.h>
+#include <types/types.h>
 #include <system/system.h>
 
 #include "device-handler.h"
@@ -19,10 +19,7 @@
 #include "parser.h"
 #include "udev.h"
 #include "paths.h"
-
-#define MOUNT_BIN "/bin/mount"
-
-#define UMOUNT_BIN "/bin/umount"
+#include "boot.h"
 
 struct device_handler {
 	struct discover_server *server;
@@ -33,11 +30,6 @@ struct device_handler {
 	struct list contexts;
 };
 
-struct mount_map {
-	char *device_path;
-	char *mount_point;
-};
-
 /**
  * device_handler_add - Add a device to the handler device array.
  */
@@ -194,7 +186,7 @@ static int mount_device(struct discover_context *ctx)
 		pb_log("couldn't create mount directory %s: %s\n",
 				ctx->mount_path, strerror(errno));
 
-	argv[0] = MOUNT_BIN;
+	argv[0] = pb_system_apps.mount;
 	argv[1] = ctx->device_path;
 	argv[2] = ctx->mount_path;
 	argv[3] = "-o";
@@ -205,7 +197,7 @@ static int mount_device(struct discover_context *ctx)
 
 		/* Retry mount without ro option. */
 
-		argv[0] = MOUNT_BIN;
+		argv[0] = pb_system_apps.mount;
 		argv[1] = ctx->device_path;
 		argv[2] = ctx->mount_path;
 		argv[3] = NULL;
@@ -236,7 +228,8 @@ static int umount_device(struct discover_context *ctx)
 	}
 
 	if (pid == 0) {
-		execl(UMOUNT_BIN, UMOUNT_BIN, ctx->mount_path, NULL);
+		execl(pb_system_apps.umount, pb_system_apps.umount,
+						ctx->mount_path, NULL);
 		exit(EXIT_FAILURE);
 	}
 
@@ -437,3 +430,30 @@ void device_handler_destroy(struct device_handler *handler)
 {
 	talloc_free(handler);
 }
+
+static struct 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 device *dev = handler->devices[i];
+		struct boot_option *opt;
+
+		list_for_each_entry(&dev->boot_options, opt, list)
+			if (!strcmp(opt->id, id))
+				return opt;
+	}
+
+	return NULL;
+}
+
+void device_handler_boot(struct device_handler *handler,
+		struct boot_command *cmd)
+{
+	struct boot_option *opt;
+
+	opt = find_boot_option_by_id(handler, cmd->option_id);
+
+	boot(handler, opt, cmd, 0);
+}