summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-09-19 13:04:15 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-09-19 13:04:15 +0000
commita20708b781616583eddc09c287de1653ebc8f7e8 (patch)
tree493c1a26ca4171c88e6118222c856800ad8c5b39
parent901718aefd0b6dc7abf71cb9ba2a380cb37919e5 (diff)
downloaddrakx-a20708b781616583eddc09c287de1653ebc8f7e8.tar
drakx-a20708b781616583eddc09c287de1653ebc8f7e8.tar.gz
drakx-a20708b781616583eddc09c287de1653ebc8f7e8.tar.bz2
drakx-a20708b781616583eddc09c287de1653ebc8f7e8.tar.xz
drakx-a20708b781616583eddc09c287de1653ebc8f7e8.zip
catch error in Done (mainly "reboot needed"), so that fstab can be written
even if reboot needed (useful when removing partitions mounted by default)
-rw-r--r--perl-install/diskdrake/interactive.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 6d482e8af..46989c40c 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -208,7 +208,11 @@ sub main {
}
partition_table::assign_device_numbers($_) foreach fsedit::all_hds($all_hds);
}
- Done($in, $all_hds) or goto &main;
+ return if eval { Done($in, $all_hds) };
+ if (my $err = $@) {
+ $in->ask_warn(_("Error"), formatError($err));
+ }
+ goto &main;
}