From b1bad536ceb7882bc1e004b2a56d88e11cbeb1a6 Mon Sep 17 00:00:00 2001
From: Dieter Plaetinck <dieter@plaetinck.be>
Date: Fri, 12 Dec 2008 14:57:39 +0100
Subject: display little nicer

---
 src/core/libs/lib-ui-interactive.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh
index 1b1da44..964d11c 100644
--- a/src/core/libs/lib-ui-interactive.sh
+++ b/src/core/libs/lib-ui-interactive.sh
@@ -402,8 +402,14 @@ interactive_filesystems() {
 				# leave out unneeded info from fs string
 				fs_display=${fs//;yes/}
 				fs_display=${fs//;target/}
-				infostring="$type,$label,$fs_display"
-				[ -b ${part/+/} ] && get_blockdevice_size ${part/+/} IEC && infostring="${BLOCKDEVICE_SIZE}MB,$infostring" # add size in MB for existing blockdevices (eg not for mapper devices that are not yet created yet) #TODO: ${BLOCKDEVICE_SIZE} is empty?
+				[ "$label" != no_label ] && label_display="($label)"
+				[ "$label"  = no_label ] && label_display=
+				if [ -b ${part/+/} ] && get_blockdevice_size ${part/+/} IEC
+				then
+					infostring="${type},${BLOCKDEVICE_SIZE}MB${label_display}-->$fs_display" # add size in MB for existing blockdevices (eg not for mapper devices that are not yet created yet) #TODO: ${BLOCKDEVICE_SIZE} is empty sometimes?
+				else
+					infostring="${type}${label_display}-->$fs_display"
+				fi
 				menu_list="$menu_list $part $infostring" #don't add extra spaces, dialog doesn't like that.
 			done < $TMP_BLOCKDEVICES
 
-- 
cgit v1.2.3-54-g00ecf