print an error message when the partitioning fails instead of dying

1 files changed, 13 insertions, 1 deletions

diff --git a/draklive-install b/draklive-install
index 85fd437..73294f3 100755
--- a/draklive-install
+++ b/draklive-install
@@ -47,7 +47,7 @@ sub install_live() {
 
     display_start_message();
     init_hds($in, $all_hds, $fstab);
-    ask_partitions($in, $all_hds, $fstab);
+    ask_partitions_loop($in, $all_hds, $fstab);
     prepare_root($in, $all_hds);
     copy_root($in, $copy_source);
     complete_install($in, $all_hds);
@@ -109,6 +109,18 @@ sub init_hds {
     umount_all($fstab);
 }
 
+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);
+    }
+}
+
 sub ask_partitions {
     my ($in, $all_hds, $fstab) = @_;
     fs::partitioning_wizard::main($in, $all_hds, $fstab, [], undef, {}, 'skip_mtab');