discover: Maintain a backlog of status updates
[petitboot] / ui / ncurses / nc-menu.c
index b42dc23e556c5f2dc85081a2a1dcfb718671e8ab..90a2c0a996c6b9704653657f8a291fc1d2709892 100644 (file)
@@ -264,8 +264,6 @@ struct pmenu_item *pmenu_find_device(struct pmenu *menu, struct device *dev,
                }
                if (matched) {
                        snprintf(buf,sizeof(buf),"[%s: %s / %s]",
-                               dev->type == DEVICE_TYPE_OPTICAL ?
-                               _("CD/DVD") :
                                device_type_display_name(dev->type),
                                bd->name, bd->uuid);
                }
@@ -287,6 +285,12 @@ struct pmenu_item *pmenu_find_device(struct pmenu *menu, struct device *dev,
                                _("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 */
@@ -324,9 +328,10 @@ static int pmenu_item_get_index(const struct pmenu_item *item)
 {
        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)"));
@@ -413,6 +418,9 @@ static void pmenu_process_key(struct nc_scr *scr, int key)
        case 'l':
                cui_show_lang(cui_from_arg(scr->ui_ctx));
                break;
+       case 'g':
+               cui_show_statuslog(cui_from_arg(scr->ui_ctx));
+               break;
        case KEY_F(1):
        case 'h':
                if (menu->help_text)