discover/status: Use full URL in parse status message

[petitboot] / discover / device-handler.c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index af7918b5114000f1c706564ebb0a8c9d05b116f3..d038c5b641e8c4e42420e615612542bde5cadaf3 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -114,6 +114,12 @@ const struct discover_device *device_handler_get_device(
        return handler->devices[index];
 }
 
+struct network *device_handler_get_network(
+               const struct device_handler *handler)
+{
+       return handler->network;
+}
+
 struct discover_boot_option *discover_boot_option_create(
                struct discover_context *ctx,
                struct discover_device *device)
@@ -788,8 +794,8 @@ struct discover_context *device_handler_discover_context_create(
        struct discover_context *ctx;
 
        ctx = talloc_zero(handler, struct discover_context);
+       ctx->handler = handler;
        ctx->device = device;
-       ctx->network = handler->network;
        list_init(&ctx->boot_options);
 
        return ctx;
@@ -934,8 +940,6 @@ int device_handler_discover(struct device_handler *handler,
        device_handler_discover_context_commit(handler, ctx);
 
 out:
-       device_handler_status_dev_info(handler, dev, _("Processing complete"));
-
        talloc_unlink(handler, ctx);
 
        return 0;
@@ -948,7 +952,8 @@ int device_handler_dhcp(struct device_handler *handler,
        struct discover_context *ctx;
 
        device_handler_status_dev_info(handler, dev,
-                       _("Processing dhcp event"));
+                       _("Processing DHCP lease response (ip: %s)"),
+                       event_get_param(event, "ip"));
 
        /* create our context */
        ctx = device_handler_discover_context_create(handler, dev);
@@ -959,8 +964,6 @@ int device_handler_dhcp(struct device_handler *handler,
 
        device_handler_discover_context_commit(handler, ctx);
 
-       device_handler_status_dev_info(handler, dev, _("Processing complete"));
-
        talloc_unlink(handler, ctx);
 
        return 0;