From a20708b781616583eddc09c287de1653ebc8f7e8 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 19 Sep 2002 13:04:15 +0000
Subject: catch error in Done (mainly "reboot needed"), so that fstab can be
 written even if reboot needed (useful when removing partitions mounted by
 default)

---
 perl-install/diskdrake/interactive.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'perl-install/diskdrake')

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;
 }
 
 
-- 
cgit v1.2.1