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 <sam@mendozajonas.com>

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 94a3f1c847f09fd3c26e22c88edbfb42ac365924..f1270c8ca660b7c771f0e08023e4559345f1e5bc 100644 (file)
--- 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 */
 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)
        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;
 
        if (!handler->udev)
                return -1;
 

-       handler->user_event = user_event_init(handler, handler->waitset);
-       if (!handler->user_event)
-               return -1;
-

        return 0;
 }
 
        return 0;
 }