discover: Use device_handler_status_dev_* for device-specific status

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 87a46c72a0e2f8a5b0fa71309ee922ce28d07e78..af7918b5114000f1c706564ebb0a8c9d05b116f3 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -905,15 +905,14 @@ int device_handler_discover(struct device_handler *handler,
        struct discover_context *ctx;
        int rc;
 
        struct discover_context *ctx;
        int rc;
 

-       /*
-        * TRANSLATORS: this string will be passed the type and identifier
-        * of the device. For example, the first parameter could be "Disk",
-        * (which will be translated accordingly) and the second a Linux device
-        * identifier like 'sda1' (which will not be translated)
-        */
-       device_handler_status_info(handler, _("Processing %s device %s"),
-                               device_type_display_name(dev->device->type),
-                               dev->device->id);
+       device_handler_status_dev_info(handler, dev,
+               /*
+                * TRANSLATORS: this string will be passed the type of the
+                * device (eg "disk" or "network"), which will be translated
+                * accordingly.
+                */
+               _("Processing new %s device"),
+               device_type_display_name(dev->device->type));

 
        process_boot_option_queue(handler);
 
 
        process_boot_option_queue(handler);
 


@@ -935,12 +934,7 @@ int device_handler_discover(struct device_handler *handler,
        device_handler_discover_context_commit(handler, ctx);
 
 out:
        device_handler_discover_context_commit(handler, ctx);
 
 out:

-       /*
-        * TRANSLATORS: the format specifier in this string is a Linux
-        * device identifier, like 'sda1'
-        */
-       device_handler_status_info(handler, _("Processing %s complete"),
-                               dev->device->id);
+       device_handler_status_dev_info(handler, dev, _("Processing complete"));

 
        talloc_unlink(handler, ctx);
 
 
        talloc_unlink(handler, ctx);
 


@@ -953,12 +947,8 @@ int device_handler_dhcp(struct device_handler *handler,
 {
        struct discover_context *ctx;
 
 {
        struct discover_context *ctx;
 

-       /*
-        * TRANSLATORS: this format specifier will be the name of a network
-        * device, like 'eth0'.
-        */
-       device_handler_status_info(handler, _("Processing dhcp event on %s"),
-                               dev->device->id);
+       device_handler_status_dev_info(handler, dev,
+                       _("Processing dhcp event"));

 
        /* create our context */
        ctx = device_handler_discover_context_create(handler, dev);
 
        /* create our context */
        ctx = device_handler_discover_context_create(handler, dev);


@@ -969,12 +959,7 @@ int device_handler_dhcp(struct device_handler *handler,
 
        device_handler_discover_context_commit(handler, ctx);
 
 
        device_handler_discover_context_commit(handler, ctx);
 

-       /*
-        * TRANSLATORS: this format specifier will be the name of a network
-        * device, like 'eth0'.
-        */
-       device_handler_status_info(handler, _("Processing %s complete"),
-                               dev->device->id);
+       device_handler_status_dev_info(handler, dev, _("Processing complete"));

 
        talloc_unlink(handler, ctx);
 
 
        talloc_unlink(handler, ctx);
 

diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index 5ac6990a876ecb9bc1873648e7601416ae40a7a7..8237c4b46b2b29b8417fa661b8afacb70777b130 100644 (file)
--- a/discover/pxe-parser.c
+++ b/discover/pxe-parser.c
@@ -282,8 +282,9 @@ static void pxe_conf_parse_cb(struct load_url_result *result, void *data)
         * TRANSLATORS: the format specifier in this string in an IP address,
         * eg. 192.168.1.1
         */
         * TRANSLATORS: the format specifier in this string in an IP address,
         * eg. 192.168.1.1
         */

-       device_handler_status_info(handler, _("pxe: parsed config for %s"),
-                                       conf->dc->conf_url->host);
+       device_handler_status_dev_info(handler, conf->dc->device,
+                       _("Parsed PXE config from %s"),
+                       conf->dc->conf_url->host);

 
        talloc_free(buf);
 out_clean:
 
        talloc_free(buf);
 out_clean: