diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-08-14 10:09:06 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-08-14 10:09:06 +0000 |
| commit | 6902c58d1e5aa892c6e894baa4e8568ecde765c0 (patch) | |
| tree | c740542e75110b2ea10c6297ae4fc7db46f2d9ba /perl-install/standalone | |
| parent | d9846c730dd2df3e66b3c0a37408a710f4dc0e48 (diff) | |
| download | drakx-6902c58d1e5aa892c6e894baa4e8568ecde765c0.tar drakx-6902c58d1e5aa892c6e894baa4e8568ecde765c0.tar.gz drakx-6902c58d1e5aa892c6e894baa4e8568ecde765c0.tar.bz2 drakx-6902c58d1e5aa892c6e894baa4e8568ecde765c0.tar.xz drakx-6902c58d1e5aa892c6e894baa4e8568ecde765c0.zip | |
$all_hds->{hds} must be filled in any case, not only in --hd
Diffstat (limited to 'perl-install/standalone')
| -rwxr-xr-x | perl-install/standalone/diskdrake | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake index ae07e8ebe..c2ebcd5f1 100755 --- a/perl-install/standalone/diskdrake +++ b/perl-install/standalone/diskdrake @@ -72,8 +72,7 @@ if ($type eq 'fileshare') { $in->exit(0); } -my $all_hds = do { - if ($type eq 'hd') { +my $all_hds = catch_cdie { fsedit::hds([ detect_devices::hds() ], {}) } sub { my $err = formatError($@); @@ -86,8 +85,6 @@ I'll try to go on blanking bad partitions"), $err]); 1; } }; - } else { fsedit::empty_all_hds() } -}; $SIG{__DIE__} = sub { my $m = chomp_($_[0]); log::l("ERROR: $m") }; my $fstab = [ fsedit::get_all_fstab($all_hds) ]; |