X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=730be857f5e564fdfea8938dbfc134d1f3c679be;hp=ec1eee344802a24e3c9f4febdd69d1c6f6fdc6c4;hb=5314cebf5fe766bdca6c779e785b8dfaa3808142;hpb=18158dcd2e9e78ecf77374153801e01b0187e6ed

diff --git a/discover/device-handler.c b/discover/device-handler.c
index ec1eee3..730be85 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -361,6 +361,7 @@ void device_handler_reinit(struct device_handler *handler)
 
 	/* Cancel any remaining async jobs */
 	process_stop_async_all();
+	pending_network_jobs_cancel();
 
 	/* free unresolved boot options */
 	list_for_each_entry_safe(&handler->unresolved_boot_options,
@@ -1083,6 +1084,8 @@ int device_handler_dhcp(struct device_handler *handler,
 			_("Processing DHCP lease response (ip: %s)"),
 			event_get_param(event, "ip"));
 
+	pending_network_jobs_start();
+
 	/* create our context */
 	ctx = device_handler_discover_context_create(handler, dev);
 	talloc_steal(ctx, event);
@@ -1407,6 +1410,8 @@ static void device_handler_reinit_sources(struct device_handler *handler)
 		return;
 	}
 
+	system_info_reinit();
+
 	udev_reinit(handler->udev);
 
 	network_shutdown(handler->network);