diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2009-08-01 18:36:47 +0200 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2009-08-01 18:36:47 +0200 |
| commit | 887a8d1df4c4bab636023d2fd4f6ac3592318574 (patch) | |
| tree | 711433457c08d54cc2f57311b43e37d946a6d246 /src/core/libs | |
| parent | 5312add5abeb5ead92ed7397c53092295f86a143 (diff) | |
simplify FS asking in autoprepare + write datafiles first, then ask for confirmation
Diffstat (limited to 'src/core/libs')
| -rw-r--r-- | src/core/libs/lib-ui-interactive.sh | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index 8c0316f..48b4866 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -276,15 +276,8 @@ interactive_autoprepare() ask_yesno "$(($BLOCKDEVICE_SIZE-$ROOT_PART_SIZE)) MiB will be used for your /home partition. Is this OK?" yes && ROOT_PART_SET=1 #TODO: when doing yes, cli mode prints option JFS all the time, dia mode goes back to disks menu done - CHOSEN_FS="" - while [ "$CHOSEN_FS" = "" ] - do - ask_option no 'Filesystem selection' "Select a filesystem for / and /home:" required $FSOPTS || return 1 - FSTYPE=$ANSWER_OPTION - ask_yesno "$FSTYPE will be used for / and /home. Is this OK?" yes && CHOSEN_FS=1 - done - - ask_yesno "$DISC will be COMPLETELY ERASED! Are you absolutely sure?" || return 1 + ask_option no 'Filesystem selection' "Select a filesystem for / and /home:" required $FSOPTS || return 1 + FSTYPE=$ANSWER_OPTION echo "$DISC $BOOT_PART_SIZE:ext2:+ $SWAP_PART_SIZE:swap $ROOT_PART_SIZE:$FSTYPE *:$FSTYPE" > $TMP_PARTITIONS @@ -294,6 +287,8 @@ interactive_autoprepare() echo "${DISC}3 raw no_label $FSTYPE;yes;/;target;no_opts;no_label;no_params" >> $TMP_BLOCKDEVICES echo "${DISC}4 raw no_label $FSTYPE;yes;/home;target;no_opts;no_label;no_params" >> $TMP_BLOCKDEVICES + ask_yesno "$DISC will be COMPLETELY ERASED! Are you absolutely sure?" || return 1 + process_disks || die_error "Something went wrong while partitioning" if ! process_filesystems |