summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDieter Plaetinck <dieter@plaetinck.be>2010-03-06 10:49:10 +0100
committerDieter Plaetinck <dieter@plaetinck.be>2010-03-06 10:49:10 +0100
commita3d214f7bd2f00d588209febfcbbcf3572119be9 (patch)
tree492912014efce50ea1353bafd0b6e0f7e8abaddb /src
parent65a558a67e96048164883f224b5d6a1fd5a0f76e (diff)
make labels mandatory for those FSes who need it + let user optionally define label for other FSes
Diffstat (limited to 'src')
-rw-r--r--src/core/libs/lib-ui-interactive.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh
index e0cdb59..dcb6046 100644
--- a/src/core/libs/lib-ui-interactive.sh
+++ b/src/core/libs/lib-ui-interactive.sh
@@ -469,7 +469,13 @@ interactive_filesystem ()
then
default=
[ -n "$fs_label" ] && default="$fs_label"
- ask_string "Enter the label/name for this $fs_type on $part" "$default" 0 #TODO: check that you can't give LV's labels that have been given already or the installer will break
+ ask_string "Enter the label/name for this $fs_type on $part (Mandatory for this type of FS!)" "$default" || return 1 #TODO: check that you can't give LV's labels that have been given already or the installer will break.
+ fs_label=$ANSWER_STRING
+ elif [ "$fs_create" == yes ] && [ "$fs_type" = ext2 -o "$fs_type" = ext3 -o "$fs_type" = ext4 -o "$fs_type" = reiserfs -o "$fs_type" = xfs -o "$fs_type" = jfs -o "$fs_type" = vfat ]
+ then
+ default=
+ [ -n "$fs_label" ] && default="$fs_label"
+ ask_string "Enter the label for this $fs_type on $part (optional)" "$default" 0
fs_label=$ANSWER_STRING
fi