diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-15 10:40:13 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-15 10:40:13 +0100 |
| commit | eb24230a5f96c7ad3d1d1e551c4fc0f3bcc1970f (patch) | |
| tree | 84d70f1a8c18d8af951eec8dcf93b4b6206c9177 /src/core/procedures/interactive | |
| parent | 1d8787e10c03d8faa485c11540f61e972dda000e (diff) | |
be smarter, propose rollback instead of disallowing
Diffstat (limited to 'src/core/procedures/interactive')
| -rw-r--r-- | src/core/procedures/interactive | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive index 1d5f1fc..6ee7023 100644 --- a/src/core/procedures/interactive +++ b/src/core/procedures/interactive @@ -154,21 +154,16 @@ worker_prepare_disks() case $ANSWER_OPTION in "1") + [ "$BLOCK_ROLLBACK_USELESS" = "0" ] && ask_yesno "You should probably rollback your last changes first, otherwise this will probably fail. Go back to menu to do rollback?" && NEXTITEM=4 && break; interactive_autoprepare && NEXTITEM=5 && ret=0 && DISK_CONFIG_TYPE=auto;; #TODO: for some reason. if this completes $?=0, next item will be 1 :/ "2") - if [ "$DISK_CONFIG_TYPE" = "auto" ]; then - notify "You have already prepared your filesystems with Auto-prepare" #TODO: allow user to do this anyway. he can change his mind. - else - interactive_partition && ret=1 && NEXTITEM=3 && DISK_CONFIG_TYPE=manual - fi + [ "$BLOCK_ROLLBACK_USELESS" = "0" ] && ask_yesno "You should probably rollback your last changes first, otherwise this will probably fail. Go back to menu to do rollback?" && NEXTITEM=4 && break; + interactive_partition && ret=1 && NEXTITEM=3 && DISK_CONFIG_TYPE=manual ;; "3") + [ "$BLOCK_ROLLBACK_USELESS" = "0" ] && ask_yesno "You should probably rollback your last changes first, otherwise this will probably fail. Go back to menu to do rollback?" && NEXTITEM=4 && break; PARTFINISH="" - if [ "$DISK_CONFIG_TYPE" = "auto" ]; then - notify "You have already prepared your filesystems with Auto-prepare" #TODO: allow user to do this anyway. he can change his mind. - else - interactive_filesystems && ret=0 && NEXTITEM=5 && DISK_CONFIG_TYPE=manual - fi + interactive_filesystems && ret=0 && NEXTITEM=5 && DISK_CONFIG_TYPE=manual ;; "4") if [ "$BLOCK_ROLLBACK_USELESS" = "1" ] |