From c9b9f86c9debc4564b354cbdc29daa9ccaa71169 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Thu, 9 Dec 2010 10:26:47 +0100 Subject: When user hits cancel in "Manage filesystems", we should return to "Prepare Harddrive", not start processing --- src/core/libs/lib-ui-interactive.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/core/libs/lib-ui-interactive.sh') diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index 5be0bb0..eae4029 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -609,8 +609,9 @@ interactive_filesystems() { menu_list="$menu_list $part $infostring" #don't add extra spaces, dialog doesn't like that. done < $TMP_BLOCKDEVICES - ask_option no "Manage filesystems" "Here you can manage your filesystems, block devices and virtual devices (device mapper). Note that you don't *need* to specify opts, labels or extra params if you're not using lvm, dm_crypt, etc." required $menu_list DONE _ - [ $? -gt 0 ] && USERHAPPY=1 && break + ask_option no "Manage filesystems" "Here you can manage your filesystems, block devices and virtual devices (device mapper). \ + Note that you don't *need* to specify opts, labels or extra params if you're not using lvm, dm_crypt, etc." required $menu_list DONE _ + [ $? -gt 0 ] && return 1 [ "$ANSWER_OPTION" == DONE ] && USERHAPPY=1 && break part=$ANSWER_OPTION -- cgit v1.2.3-54-g00ecf