X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-menu.c;h=90a2c0a996c6b9704653657f8a291fc1d2709892;hp=7ff2468cb1c47d3b1caae9cf3180523ad920f939;hb=75c97cfd449b2bac8e61af1017a83bdf43f5e8fe;hpb=a58de4840edd7796c385c11a6d49ce28c724b305

diff --git a/ui/ncurses/nc-menu.c b/ui/ncurses/nc-menu.c
index 7ff2468..90a2c0a 100644
--- a/ui/ncurses/nc-menu.c
+++ b/ui/ncurses/nc-menu.c
@@ -62,7 +62,6 @@ static int pmenu_post(struct nc_scr *scr)
 	result = post_menu(menu->ncm);
 
 	nc_scr_frame_draw(scr);
-	redrawwin(menu->scr.main_ncw);
 	wrefresh(menu->scr.main_ncw);
 
 	return result;
@@ -254,6 +253,7 @@ struct pmenu_item *pmenu_find_device(struct pmenu *menu, struct device *dev,
 	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];
@@ -264,8 +264,7 @@ 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_DISK ?
-					_("Disk") : _("CD/DVD"),
+				device_type_display_name(dev->type),
 				bd->name, bd->uuid);
 		}
 		break;
@@ -286,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 */
@@ -323,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)"));
@@ -412,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)