summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-27 21:58:56 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-27 21:58:56 +0000
commit30efecf1b9172131e2d2019eca0f72dc63f44c43 (patch)
tree20650dc9b53ec601a28cae55b2c63efe959b4d5a
parent1965f8ae39a379ad6b4bfc1fc79d6257c776e349 (diff)
downloaddrakx-30efecf1b9172131e2d2019eca0f72dc63f44c43.tar
drakx-30efecf1b9172131e2d2019eca0f72dc63f44c43.tar.gz
drakx-30efecf1b9172131e2d2019eca0f72dc63f44c43.tar.bz2
drakx-30efecf1b9172131e2d2019eca0f72dc63f44c43.tar.xz
drakx-30efecf1b9172131e2d2019eca0f72dc63f44c43.zip
use function fsedit::get_hds which handles errors
-rwxr-xr-xperl-install/standalone/diskdrake14
1 files changed, 1 insertions, 13 deletions
diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake
index 4ae8c3143..2a6e4c7c3 100755
--- a/perl-install/standalone/diskdrake
+++ b/perl-install/standalone/diskdrake
@@ -72,19 +72,7 @@ if ($type eq 'fileshare') {
$in->exit(0);
}
-my $all_hds =
- catch_cdie { fsedit::hds([ detect_devices::hds() ], {}) }
- sub {
- my $err = formatError($@);
- if ($err =~ s/ask_before_blanking://) {
- $in->ask_okcancel(_("Error"),
-[_("I can't read your partition table, it's too corrupted for me :(
-I'll try to go on blanking bad partitions"), $err]);
- } else {
- $in->ask_warn('', $err);
- 1;
- }
- };
+my $all_hds = fsedit::get_hds({}, $in);
$SIG{__DIE__} = sub { my $m = chomp_($_[0]); log::l("ERROR: $m") };
my $fstab = [ fsedit::get_all_fstab($all_hds) ];