result = post_menu(menu->ncm);
nc_scr_frame_draw(scr);
- redrawwin(menu->scr.main_ncw);
wrefresh(menu->scr.main_ncw);
return result;
switch (dev->type) {
case DEVICE_TYPE_OPTICAL:
case DEVICE_TYPE_DISK:
+ case DEVICE_TYPE_USB:
/* Find block info */
for (i = 0; sys && i < sys->n_blockdevs; i++) {
bd = sys->blockdevs[i];
}
if (matched) {
snprintf(buf,sizeof(buf),"[%s: %s / %s]",
- dev->type == DEVICE_TYPE_DISK ?
- "Disk" : "CD/DVD",
+ device_type_display_name(dev->type),
bd->name, bd->uuid);
}
break;
if (matched) {
mac_str(intf->hwaddr, intf->hwaddr_size,
hwaddr, sizeof(hwaddr));
- snprintf(buf,sizeof(buf),"[Interface %s / %s]",
- intf->name, hwaddr);
+ snprintf(buf,sizeof(buf),"[%s: %s / %s]",
+ _("Network"), intf->name, hwaddr);
}
break;
+ case DEVICE_TYPE_ANY:
+ /* This is an option found from a file:// url, not associated
+ * with any device */
+ snprintf(buf, sizeof(buf), "[Custom Local Options]");
+ matched = true;
+ break;
default:
/* Assume the device may be able to boot */
if (!matched) {
pb_debug("%s: No matching device found for %s (%s)\n",
__func__,opt->device_id, dev->id);
- snprintf(buf,sizeof(buf),"[Unknown Device: %s]",
- dev->id);
+ snprintf(buf, sizeof(buf), "[%s: %s]",
+ _("Unknown Device"), dev->id);
}
dev_hdr = pmenu_item_create(menu, buf);
{
unsigned int i;
- for (i = 0; i < item->pmenu->item_count; i++)
- if (item->pmenu->items[i] == item->nci)
- return i;
+ if (item)
+ for (i = 0; i < item->pmenu->item_count; i++)
+ if (item->pmenu->items[i] == item->nci)
+ return i;
pb_log("%s: not found: %p %s\n", __func__, item,
(item ? item->nci->name.str : "(null)"));
case 'c':
cui_show_config(cui_from_arg(scr->ui_ctx));
break;
+ case 'l':
+ cui_show_lang(cui_from_arg(scr->ui_ctx));
+ break;
case KEY_F(1):
case 'h':
if (menu->help_text)