From: Samuel Mendoza-Jonas Date: Tue, 15 Aug 2017 01:08:58 +0000 (+1000) Subject: discover/device-handler: Be ready for user events earlier X-Git-Tag: v1.6.0~6 X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=675eb751ff84e80f286da808daa931a84baf9302 discover/device-handler: Be ready for user events earlier Actions performed in network and udev init may result in pb-event callbacks (such as from udhcpc or pb-plugin), so make sure the user event interface is set up beforehand. Signed-off-by: Samuel Mendoza-Jonas --- diff --git a/discover/device-handler.c b/discover/device-handler.c index 94a3f1c..f1270c8 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -1563,6 +1563,10 @@ static void device_handler_update_lang(const char *lang) static int device_handler_init_sources(struct device_handler *handler) { /* init our device sources: udev, network and user events */ + handler->user_event = user_event_init(handler, handler->waitset); + if (!handler->user_event) + return -1; + handler->network = network_init(handler, handler->waitset, handler->dry_run); if (!handler->network) @@ -1572,10 +1576,6 @@ static int device_handler_init_sources(struct device_handler *handler) if (!handler->udev) return -1; - handler->user_event = user_event_init(handler, handler->waitset); - if (!handler->user_event) - return -1; - return 0; }