summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-03-20 00:26:51 +0000
committerOlivier Blin <oblin@mandriva.com>2008-03-20 00:26:51 +0000
commitaa7adb1e24b6ab5fe51f4b6ec7310505b0878706 (patch)
treec810c443cba3e53ef06d5c499cca7a8c1b52e0e2
parent7f70482ccb7bff519cf9c9c76931cdb6121626e5 (diff)
downloaddraklive-install-aa7adb1e24b6ab5fe51f4b6ec7310505b0878706.tar
draklive-install-aa7adb1e24b6ab5fe51f4b6ec7310505b0878706.tar.gz
draklive-install-aa7adb1e24b6ab5fe51f4b6ec7310505b0878706.tar.bz2
draklive-install-aa7adb1e24b6ab5fe51f4b6ec7310505b0878706.tar.xz
draklive-install-aa7adb1e24b6ab5fe51f4b6ec7310505b0878706.zip
run partition step in a loop while errors occur
-rwxr-xr-xdraklive-install13
1 files changed, 7 insertions, 6 deletions
diff --git a/draklive-install b/draklive-install
index 73294f3..935ed66 100755
--- a/draklive-install
+++ b/draklive-install
@@ -112,17 +112,18 @@ sub init_hds {
sub ask_partitions_loop {
my ($in, $all_hds, $fstab) = @_;
- eval { ask_partitions($in, $all_hds, $fstab) };
- my $err = $@;
- if ($err) {
- $in->ask_warn(N("Error"), N("An error occured: %s", $err))
- if $err !~ /wizcancel/;
- $in->exit(1);
+ while (1) {
+ eval { ask_partitions($in, $all_hds, $fstab) };
+ if (my $err = $@) {
+ $in->exit(1) if $err =~ /wizcancel/ ||
+ !$in->ask_warn(N("Error"), N("An error occured: %s", $err))
+ }
}
}
sub ask_partitions {
my ($in, $all_hds, $fstab) = @_;
+ die "loop";
fs::partitioning_wizard::main($in, $all_hds, $fstab, [], undef, {}, 'skip_mtab');
mkdir_p($::prefix) or die "unable to create $::prefix";