X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=729ed2c0f52ae76f9cbc7474cd803ed773bab3a6;hp=69bc050c7241925a215d2b28d2c77c26ff740e19;hb=336f4eb17fb50526ea9fda82262356581e1b9ae0;hpb=f5fb1751ec92110669a039bb0de209bffe74538a

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 69bc050..729ed2c 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -522,6 +522,7 @@ void device_handler_remove(struct device_handler *handler,
 void device_handler_status(struct device_handler *handler,
 		struct status *status)
 {
+	pb_debug("%s: %s\n", __func__, status->message);
 	discover_server_notify_boot_status(handler->server, status);
 }
 
@@ -533,6 +534,7 @@ static void _device_handler_vstatus(struct device_handler *handler,
 	status.type = type;
 	status.message = talloc_vasprintf(handler, fmt, ap);
 	status.backlog = false;
+	status.boot_active = false;
 
 	device_handler_status(handler, &status);
 
@@ -675,7 +677,7 @@ void device_handler_status_download(struct device_handler *handler,
 	}
 
 	if (!update) {
-		pb_log("%s: failed to allocate new status\n", __func__);
+		pb_log_fn("failed to allocate new status\n");
 	} else {
 		device_handler_status_info(handler, "%s\n", update);
 		talloc_free(update);
@@ -1277,6 +1279,7 @@ static int device_handler_requery_timeout_fn(void *data)
 	struct requery_data *rqd = data;
 	struct device_handler *handler;
 	struct discover_device *device;
+	bool autoboot;
 
 	handler = rqd->handler;
 	device = rqd->device;
@@ -1299,9 +1302,14 @@ static int device_handler_requery_timeout_fn(void *data)
 		talloc_free(opt);
 	}
 
+	/* Track whether autoboot was enabled, if we cancel a default option
+	 * it will be switched off.
+	 */
+	autoboot = handler->autoboot_enabled;
+
 	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 is being requeried",
+			pb_log("Default option %s cancelled since device is being requeried\n",
 					opt->option->name);
 			device_handler_cancel_default(handler);
 		}
@@ -1309,6 +1317,8 @@ static int device_handler_requery_timeout_fn(void *data)
 		talloc_free(opt);
 	}
 
+	handler->autoboot_enabled = autoboot;
+
 	discover_server_notify_device_remove(handler->server, device->device);
 	device->notified = false;
 
@@ -1403,6 +1413,28 @@ int device_handler_dhcp(struct device_handler *handler,
 	return 0;
 }
 
+struct discover_boot_option *device_handler_find_option_by_name(
+		struct device_handler *handler, const char *device,
+		const char *name)
+{
+	size_t len = strlen(name);
+	unsigned int i;
+
+	for (i = 0; i < handler->n_devices; i++) {
+		struct discover_device *dev = handler->devices[i];
+		struct discover_boot_option *opt;
+
+		list_for_each_entry(&dev->boot_options, opt, list)
+			/* Match exactly, partial matches can be quite common */
+			if (strlen(opt->option->name) == len &&
+					!strcmp(opt->option->name, name))
+				if (!dev || !strcmp(opt->option->device_id, device))
+					return opt;
+	}
+
+	return NULL;
+}
+
 static struct discover_boot_option *find_boot_option_by_id(
 		struct device_handler *handler, const char *id)
 {
@@ -1469,8 +1501,11 @@ void device_handler_update_config(struct device_handler *handler,
 	int rc;
 
 	rc = config_set(config);
-	if (rc)
+	if (rc) {
+		device_handler_status_err(handler,
+				"Failed to update configuration!");
 		return;
+	}
 
 	discover_server_notify_config(handler->server, config);
 	device_handler_update_lang(config->lang);
@@ -1568,7 +1603,7 @@ static void process_url_cb(struct load_url_result *result, void *data)
 	const char *mac;
 
 	if (result->status != LOAD_OK) {
-		pb_log("%s: Load failed for %s\n", __func__, result->url->full);
+		pb_log_fn("Load failed for %s\n", result->url->full);
 		return;
 	}
 
@@ -1673,7 +1708,7 @@ static void plugin_install_cb(struct process *process)
 	struct device_handler *handler = process->data;
 
 	if (!handler) {
-		pb_log("%s: Missing data!\n", __func__);
+		pb_log_fn("Missing data!\n");
 		return;
 	}
 
@@ -2206,7 +2241,7 @@ 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__);
+	pb_log_fn("stubbed out for test cases\n");
 }
 
 static void device_handler_update_lang(const char *lang __attribute__((unused)))