summaryrefslogtreecommitdiffstats
path: root/perl-install/install_any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-01-07 14:35:02 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-01-07 14:35:02 +0000
commite60ed33ff9d02df22dfba05ace0a1a1fa6b506e5 (patch)
treeb7db872fa29ef5d30f03c5d6b34b63d59090a7b0 /perl-install/install_any.pm
parente444134675cc55ed92b6b4bf78fc0b48a6b0803b (diff)
downloaddrakx-e60ed33ff9d02df22dfba05ace0a1a1fa6b506e5.tar
drakx-e60ed33ff9d02df22dfba05ace0a1a1fa6b506e5.tar.gz
drakx-e60ed33ff9d02df22dfba05ace0a1a1fa6b506e5.tar.bz2
drakx-e60ed33ff9d02df22dfba05ace0a1a1fa6b506e5.tar.xz
drakx-e60ed33ff9d02df22dfba05ace0a1a1fa6b506e5.zip
(getHds): test_for_bad_drives called on hard drives
(getHds): ensure $o->{hds} is not set until the hard drives are checked
Diffstat (limited to 'perl-install/install_any.pm')
-rw-r--r--perl-install/install_any.pm11
1 files changed, 7 insertions, 4 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 6cee53a11..f1b96ca30 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -668,7 +668,7 @@ sub getHds {
# add2hash_($o->{partitioning}, { readonly => 1 }) if partition_table_raw::typeOfMBR($drives[0]{device}) eq 'system_commander';
getHds:
- $o->{hds} = catch_cdie { fsedit::hds(\@drives, $flags) }
+ my $hds = catch_cdie { fsedit::hds(\@drives, $flags) }
sub {
$ok = 0;
my $err = $@; $err =~ s/ at (.*?)$//;
@@ -676,15 +676,18 @@ sub getHds {
!$flags->{readonly} && $f_err and $f_err->($err);
};
- if (is_empty_array_ref($o->{hds}) && $o->{autoSCSI}) {
+ if (is_empty_array_ref($hds) && $o->{autoSCSI}) {
$o->setupSCSI; #- ask for an unautodetected scsi card
goto getHds;
}
- $ok = fsedit::verifyHds($o->{hds}, $flags->{readonly}, $ok)
+ partition_table_raw::test_for_bad_drives($_) foreach @$hds;
+
+ $ok = fsedit::verifyHds($hds, $flags->{readonly}, $ok)
unless $flags->{clearall} || $flags->{clear};
- $o->{fstab} = [ fsedit::get_fstab(@{$o->{hds}}) ];
+ $o->{hds} = $hds;
+ $o->{fstab} = [ fsedit::get_fstab(@$hds) ];
fs::check_mounted($o->{fstab});
fs::merge_fstabs($o->{fstab}, $o->{manualFstab});