summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDieter Plaetinck <dieter@plaetinck.be>2008-12-14 19:11:24 +0100
committerDieter Plaetinck <dieter@plaetinck.be>2008-12-14 19:11:24 +0100
commita64a83b56ce41538b6c1f49e359d82cd0b653d0d (patch)
tree5274ac0c39ccf7c1c8c140450a1114cd871d45c4
parent6229c990b0209c3585c3ca54a5a89f98bc0109c0 (diff)
rollback update string fixes in interactive procedure
-rw-r--r--src/core/procedures/interactive6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive
index 0e4a426..d70d9ad 100644
--- a/src/core/procedures/interactive
+++ b/src/core/procedures/interactive
@@ -136,10 +136,12 @@ worker_prepare_disks()
ret=1 # 1 means unsuccessful. 0 for ok
NEXTITEM=
DISK_CONFIG_TYPE=
- rollbackstr=" (you don't need to do this)"
- ended_ok worker prepare_disks && rollbackstr=" (looks like you need to do this)" && show_warning "Rollback may be needed" "It seems you already went here. You should probably rollback previous changes before reformatting, otherwise stuff will probably fail"
+ [ "$BLOCK_ROLLBACK_USELESS" = "0" ] && show_warning "Rollback may be needed" "It seems you already went here. You should probably rollback previous changes before reformatting, otherwise stuff will probably fail"
while [ "$DONE" = "0" ]
do
+ rollbackstr=" (you don't need to do this)"
+ [ "$BLOCK_ROLLBACK_USELESS" = "0" ] && rollbackstr=" (this will revert your last changes)"
+
default=no
[ -n "$NEXTITEM" ] && default="$NEXTITEM"