discover/pxe-parser: Recognise plugin sources

[petitboot] / discover / device-handler.c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 38584440801963e193a7aee2ad9c7a62cb89f9d3..ec4a6f611ff289ee9d4bc61182401897c41ff1ba 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -628,7 +628,8 @@ static void countdown_status(struct device_handler *handler,
 
        status.type = STATUS_INFO;
        status.message = talloc_asprintf(handler,
-                       _("Booting in %d sec: %s"), sec, opt->option->name);
+                       _("Booting in %d sec: [%s] %s"), sec,
+                       opt->device->device->id, opt->option->name);
        status.backlog = false;
 
        device_handler_status(handler, &status);
@@ -1424,15 +1425,15 @@ 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->udev = udev_init(handler, handler->waitset);
-       if (!handler->udev)
-               return -1;
-
        handler->network = network_init(handler, handler->waitset,
                        handler->dry_run);
        if (!handler->network)
                return -1;
 
+       handler->udev = udev_init(handler, handler->waitset);
+       if (!handler->udev)
+               return -1;
+
        handler->user_event = user_event_init(handler, handler->waitset);
        if (!handler->user_event)
                return -1;
@@ -1451,11 +1452,11 @@ static void device_handler_reinit_sources(struct device_handler *handler)
 
        system_info_reinit();
 
-       udev_reinit(handler->udev);
-
        network_shutdown(handler->network);
        handler->network = network_init(handler, handler->waitset,
                        handler->dry_run);
+
+       udev_reinit(handler->udev);
 }
 
 static inline const char *get_device_path(struct discover_device *dev)