summaryrefslogtreecommitdiffstats
path: root/discover/device-handler.c
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2016-12-12 15:58:57 +0800
committerSamuel Mendoza-Jonas <sam@mendozajonas.com>2016-12-20 16:40:21 +1100
commitbdd5c29b008a4484ed141f934d97465d673a10b7 (patch)
treec290c92f879ae5dd33783175df58fd3cb57b6a7e /discover/device-handler.c
parent8ed7af65d5eaea57a62c26bef6267047cf3c95ea (diff)
downloadtalos-petitboot-bdd5c29b008a4484ed141f934d97465d673a10b7.zip
talos-petitboot-bdd5c29b008a4484ed141f934d97465d673a10b7.tar.gz
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>
Diffstat (limited to 'discover/device-handler.c')
-rw-r--r--discover/device-handler.c39
1 files changed, 12 insertions, 27 deletions
diff --git a/discover/device-handler.c b/discover/device-handler.c
index 87a46c7..af7918b 100644
--- 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;
- /*
- * 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);
@@ -935,12 +934,7 @@ int device_handler_discover(struct device_handler *handler,
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);
@@ -953,12 +947,8 @@ int device_handler_dhcp(struct device_handler *handler,
{
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);
@@ -969,12 +959,7 @@ int device_handler_dhcp(struct device_handler *handler,
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);
OpenPOWER on IntegriCloud