X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-menu.c;h=dda7626410974ec778089f8a24b9ed6f6857bc2d;hp=666b78bbfee23d5bd7688958adc828eeda62b3d1;hb=9239994cdedfc5dd70e3c5d27ea92754674aaa1f;hpb=9330aba60a05a8d9889dab42bc92b9ebbc55941b

diff --git a/ui/ncurses/nc-menu.c b/ui/ncurses/nc-menu.c
index 666b78b..dda7626 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;
@@ -282,8 +281,8 @@ struct pmenu_item *pmenu_find_device(struct pmenu *menu, struct device *dev,
 		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;
 
@@ -294,8 +293,8 @@ struct pmenu_item *pmenu_find_device(struct pmenu *menu, struct device *dev,
 	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);
@@ -323,9 +322,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)"));