From: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
Date: Tue, 25 Aug 2015 01:08:09 +0000 (+1000)
Subject: Consolidate display string for optical devices
X-Git-Tag: v1.0.0~56
X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=b4d338c2ae40f16091a4bb4a0cc4f2e322f4f4b9

Consolidate display string for optical devices

Instead of using 'Optical' in some places and 'CD/DVD' in others, simply
use 'CD/DVD' for all cases.

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
---

diff --git a/lib/types/types.c b/lib/types/types.c
index 611f2a1..63045e1 100644
--- a/lib/types/types.c
+++ b/lib/types/types.c
@@ -30,7 +30,7 @@ const char *device_type_display_name(enum device_type type)
 	case DEVICE_TYPE_USB:
 		return _("USB");
 	case DEVICE_TYPE_OPTICAL:
-		return _("Optical");
+		return _("CD/DVD");
 	case DEVICE_TYPE_NETWORK:
 		return _("Network");
 	case DEVICE_TYPE_ANY:
diff --git a/ui/ncurses/nc-menu.c b/ui/ncurses/nc-menu.c
index b42dc23..3f09d62 100644
--- a/ui/ncurses/nc-menu.c
+++ b/ui/ncurses/nc-menu.c
@@ -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);
 		}