X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;fp=discover%2Fdevice-handler.c;h=78fb159a3026a2d515d05d0467eae27bd4e33938;hp=a3891c4564b62644fd5b51ac2d740b4ba1058ac1;hb=75e89298319041ac2cc96102c8345dc175e5e0db;hpb=6fab22db693aaf495b8be0699e6d177ba69d79ed

diff --git a/discover/device-handler.c b/discover/device-handler.c
index a3891c4..78fb159 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -351,6 +351,12 @@ void device_handler_reinit(struct device_handler *handler)
 	unsigned int i;
 
 	device_handler_cancel_default(handler);
+	/* Cancel any pending non-default boot */
+	if (handler->pending_boot) {
+		boot_cancel(handler->pending_boot);
+		handler->pending_boot = NULL;
+		handler->pending_boot_is_default = false;
+	}
 
 	/* free unresolved boot options */
 	list_for_each_entry_safe(&handler->unresolved_boot_options,