status = talloc_zero(handler, struct boot_status);
status->type = BOOT_STATUS_INFO;
- status->message = talloc_asprintf(status, "Processing %s device %s",
+ /*
+ * 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)
+ */
+ status->message = talloc_asprintf(status, _("Processing %s device %s"),
device_type_display_name(dev->device->type),
dev->device->id);
boot_status(handler, status);
device_handler_discover_context_commit(handler, ctx);
out:
- status->message = talloc_asprintf(status,"Processing %s complete\n",
+ /*
+ * TRANSLATORS: the format specifier in this string is a Linux
+ * device identifier, like 'sda1'
+ */
+ status->message = talloc_asprintf(status,_("Processing %s complete"),
dev->device->id);
boot_status(handler, status);
status = talloc_zero(handler, struct boot_status);
status->type = BOOT_STATUS_INFO;
- status->message = talloc_asprintf(status, "Processing dhcp event on %s",
+ /*
+ * TRANSLATORS: this format specifier will be the name of a network
+ * device, like 'eth0'.
+ */
+ status->message = talloc_asprintf(status, _("Processing dhcp event on %s"),
dev->device->id);
boot_status(handler, status);
device_handler_discover_context_commit(handler, ctx);
- status->message = talloc_asprintf(status,"Processing %s complete\n",
+ /*
+ * TRANSLATORS: this format specifier will be the name of a network
+ * device, like 'eth0'.
+ */
+ status->message = talloc_asprintf(status,_("Processing %s complete"),
dev->device->id);
boot_status(handler, status);
status = talloc_zero(handler, struct boot_status);
status->type = BOOT_STATUS_INFO;
- status->message = talloc_asprintf(status, "Processing user config");
+ status->message = talloc_asprintf(status, _("Processing user config"));
boot_status(handler, status);
/* create our context */
device_handler_discover_context_commit(handler, ctx);
status->message = talloc_asprintf(status,
- "Processing user config complete");
+ _("Processing user config complete"));
boot_status(handler, status);
talloc_free(status);
void device_release_write(struct discover_device *dev, bool release)
{
const char *fstype, *device_path;
- int rc = 0;
if (!release)
return;
device_path = get_device_path(dev);
}
- mount(device_path, dev->mount_path, fstype,
+ if (mount(device_path, dev->mount_path, fstype,
MS_RDONLY | MS_SILENT,
- fs_parameters(dev, MS_RDONLY));
- if (rc)
+ fs_parameters(dev, MS_RDONLY)))
pb_log("Failed to remount %s read-only: %s\n",
device_path, strerror(errno));
else