diff options
author | Olivier Blin <oblin@mandriva.com> | 2008-03-20 00:20:13 +0000 |
---|---|---|
committer | Olivier Blin <oblin@mandriva.com> | 2008-03-20 00:20:13 +0000 |
commit | 7f70482ccb7bff519cf9c9c76931cdb6121626e5 (patch) | |
tree | 6ca80fa31f18587ad510e99eec0a0aada037cbe9 | |
parent | 1a3b1d4026a4654073affe572981f268068ead3f (diff) | |
download | draklive-install-7f70482ccb7bff519cf9c9c76931cdb6121626e5.tar draklive-install-7f70482ccb7bff519cf9c9c76931cdb6121626e5.tar.gz draklive-install-7f70482ccb7bff519cf9c9c76931cdb6121626e5.tar.bz2 draklive-install-7f70482ccb7bff519cf9c9c76931cdb6121626e5.tar.xz draklive-install-7f70482ccb7bff519cf9c9c76931cdb6121626e5.zip |
print an error message when the partitioning fails instead of dying
-rwxr-xr-x | draklive-install | 14 |
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'); |