X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=discover%2Fdevice-handler.c;h=80187ff49474a186cfb5b7e5bb7bceb0f4209404;hb=90d16d056b4d7c6b8e2afb6b3406babd38f6c9e5;hp=cfd0c7bf8b5effede8b706493301c44d7ffc5503;hpb=b8e53cb4b96eb17dc7fa0ffc505dfebae37e6cbf;p=petitboot

diff --git a/discover/device-handler.c b/discover/device-handler.c
index cfd0c7b..80187ff 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -1,4 +1,3 @@
-
 #include <assert.h>
 #include <stdlib.h>
 #include <stdbool.h>
@@ -9,7 +8,6 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 
-#include <pb-config/pb-config.h>
 #include <talloc/talloc.h>
 #include <list/list.h>
 #include <log/log.h>
@@ -20,10 +18,12 @@
 
 #include "device-handler.h"
 #include "discover-server.h"
+#include "platform.h"
 #include "event.h"
 #include "parser.h"
 #include "resource.h"
 #include "paths.h"
+#include "sysinfo.h"
 #include "boot.h"
 
 struct device_handler {
@@ -250,7 +250,7 @@ const char *discover_device_get_param(struct discover_device *device,
 
 	list_for_each_entry(&device->params, param, list) {
 		if (!strcmp(param->name, name))
-			return param->name;
+			return param->value;
 	}
 	return NULL;
 }
@@ -279,6 +279,7 @@ struct device_handler *device_handler_init(struct discover_server *server,
 void device_handler_remove(struct device_handler *handler,
 		struct discover_device *device)
 {
+	struct discover_boot_option *opt, *tmp;
 	unsigned int i;
 
 	for (i = 0; i < handler->n_devices; i++)
@@ -290,6 +291,16 @@ void device_handler_remove(struct device_handler *handler,
 		return;
 	}
 
+	/* Free any unresolved options, as they're currently allocated
+	 * against the handler */
+	list_for_each_entry_safe(&handler->unresolved_boot_options,
+			opt, tmp, list) {
+		if (opt->device != device)
+			continue;
+		list_remove(&opt->list);
+		talloc_free(opt);
+	}
+
 	handler->n_devices--;
 	memmove(&handler->devices[i], &handler->devices[i + 1],
 		(handler->n_devices - i) * sizeof(handler->devices[0]));
@@ -361,42 +372,51 @@ static int default_timeout(void *arg)
 static bool priority_match(struct boot_priority *prio,
 		struct discover_boot_option *opt)
 {
-	return prio->type == opt->device->device->type;
+	return prio->type == opt->device->device->type ||
+		prio->type == DEVICE_TYPE_ANY;
 }
 
 static int default_option_priority(struct discover_boot_option *opt)
 {
 	const struct config *config;
 	struct boot_priority *prio;
-	int i;
+	unsigned int i;
 
 	config = config_get();
 
 	for (i = 0; i < config->n_boot_priorities; i++) {
 		prio = &config->boot_priorities[i];
 		if (priority_match(prio, opt))
-			break;
+			return prio->priority;
 	}
 
-	return i;
+	return 0;
 }
 
 static void set_default(struct device_handler *handler,
 		struct discover_boot_option *opt)
 {
+	int new_prio;
+
 	if (!handler->autoboot_enabled)
 		return;
 
+	new_prio = default_option_priority(opt);
+
+	/* A negative priority indicates that we don't want to boot this device
+	 * by default */
+	if (new_prio < 0)
+		return;
+
 	/* Resolve any conflicts: if we have a new default option, it only
 	 * replaces the current if it has a higher priority. */
 	if (handler->default_boot_option) {
-		int new_prio, cur_prio;
+		int cur_prio;
 
-		new_prio = default_option_priority(opt);
 		cur_prio = default_option_priority(
 					handler->default_boot_option);
 
-		if (new_prio < cur_prio) {
+		if (new_prio > cur_prio) {
 			handler->default_boot_option = opt;
 			/* extend the timeout a little, so the user sees some
 			 * indication of the change */
@@ -603,6 +623,10 @@ int device_handler_discover(struct device_handler *handler,
 	if (rc)
 		goto out;
 
+	/* add this device to our system info */
+	system_info_register_blockdev(dev->device->id, dev->uuid,
+			dev->mount_path);
+
 	/* run the parsers. This will populate the ctx's boot_option list. */
 	iterate_parsers(ctx);
 
@@ -717,6 +741,13 @@ void device_handler_cancel_default(struct device_handler *handler)
 	discover_server_notify_boot_status(handler->server, &status);
 }
 
+void device_handler_update_config(struct device_handler *handler,
+		struct config *config)
+{
+	config_set(config);
+	discover_server_notify_config(handler->server, config);
+}
+
 #ifndef PETITBOOT_TEST
 static bool check_existing_mount(struct discover_device *dev)
 {
@@ -805,16 +836,8 @@ static int mount_device(struct discover_device *dev)
 		return 0;
 	}
 
-	/* Retry mount without ro option. */
-	rc = process_run_simple(dev, pb_system_apps.mount,
-			dev->device_path, dev->mount_path, NULL);
-
-	if (!rc) {
-		dev->mounted = true;
-		dev->mounted_rw = true;
-		dev->unmount = true;
-		return 0;
-	}
+	pb_log("couldn't mount device %s: mount failed with rc %d\n",
+			dev->device_path, rc);
 
 	pb_rmdir_recursive(mount_base(), dev->mount_path);
 err_free: