summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorDieter Plaetinck <dieter@plaetinck.be>2008-12-12 14:57:39 +0100
committerDieter Plaetinck <dieter@plaetinck.be>2008-12-12 14:57:39 +0100
commitb1bad536ceb7882bc1e004b2a56d88e11cbeb1a6 (patch)
tree0e790421403344a8279917370469cd8588641d7a /src/core
parentf68ee6f1864807d6036ad9606bc2ddad563acbd9 (diff)
display little nicer
Diffstat (limited to 'src/core')
-rw-r--r--src/core/libs/lib-ui-interactive.sh10
1 files changed, 8 insertions, 2 deletions
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