summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Mendoza-Jonas <sam@mendozajonas.com>2017-01-24 14:52:20 +1100
committerSamuel Mendoza-Jonas <sam@mendozajonas.com>2017-01-31 11:59:26 +1100
commit6fab22db693aaf495b8be0699e6d177ba69d79ed (patch)
tree0d4fe2cbfdcc68e5218bb35e7710072bdda91051
parent58b86dca9e65824e8fd25df58794a88ac31ab01f (diff)
downloadtalos-petitboot-6fab22db693aaf495b8be0699e6d177ba69d79ed.zip
talos-petitboot-6fab22db693aaf495b8be0699e6d177ba69d79ed.tar.gz
discover/device-handler: Process queue after device added
In device_handler_discover() we process the unresolved boot options queue first. However the discover_device in question has not yet been added to handler->devices so when a parser tries to search for a matching device it will fail. The discover_device will be added to the handler if it has not already in device_handler_discover_context_commit() so move the call to process_boot_option_queue() after it. Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
-rw-r--r--discover/device-handler.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/discover/device-handler.c b/discover/device-handler.c
index 48bfa0e..a3891c4 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -1039,8 +1039,6 @@ int device_handler_discover(struct device_handler *handler,
_("Processing new %s device"),
device_type_display_name(dev->device->type));
- process_boot_option_queue(handler);
-
/* create our context */
ctx = device_handler_discover_context_create(handler, dev);
@@ -1058,6 +1056,7 @@ int device_handler_discover(struct device_handler *handler,
/* add discovered stuff to the handler */
device_handler_discover_context_commit(handler, ctx);
+ process_boot_option_queue(handler);
out:
talloc_unlink(handler, ctx);
OpenPOWER on IntegriCloud