X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;fp=discover%2Fdevice-handler.c;h=983c50909ef7f5900f916bb5cf4040b7bdf6d994;hp=cf379e78ca7f7ecc1f52adbca0fedc2e22903fa8;hb=3917e88b838001b13a19fc6ea01d08b08c0770ca;hpb=c4be9490a5d94b662370576157b6e0ed73f2fe77

diff --git a/discover/device-handler.c b/discover/device-handler.c
index cf379e7..983c509 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -1278,6 +1278,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;
@@ -1300,9 +1301,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);
 		}
@@ -1310,6 +1316,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;