summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-11-27 17:15:02 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-11-27 17:15:02 +0000
commit48eccdbedd9787345e73bfd6d7961b00289884e7 (patch)
tree27ed3d509d57766dec31dac6f0fc7fe511af2e92
parentb9f70ab579c4f5b31076576556859595564056b3 (diff)
downloaddrakx-48eccdbedd9787345e73bfd6d7961b00289884e7.tar
drakx-48eccdbedd9787345e73bfd6d7961b00289884e7.tar.gz
drakx-48eccdbedd9787345e73bfd6d7961b00289884e7.tar.bz2
drakx-48eccdbedd9787345e73bfd6d7961b00289884e7.tar.xz
drakx-48eccdbedd9787345e73bfd6d7961b00289884e7.zip
put in {raw_hds} non partitioned usb keys
-rw-r--r--perl-install/fsedit.pm7
1 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 1bd99657d..6aed45d48 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -175,7 +175,7 @@ sub hds {
my @drives = detect_devices::hds();
- my (@hds);
+ my (@hds, @raw_hds);
foreach my $hd (@drives) {
$hd->{file} = devices::make($hd->{device});
$hd->{prefix} ||= $hd->{device};
@@ -205,6 +205,9 @@ sub hds {
if ($hd->{readonly}) {
log::l("using /proc/partitions since diskdrake failed :(");
use_proc_partitions($hd);
+ } elsif (exists $hd->{usb_description} && ($hd->{type} ||= typeOfPart($hd->{device}))) {
+ push @raw_hds, $hd;
+ next;
} elsif ($o_ask_before_blanking && $o_ask_before_blanking->($hd->{device}, $err)) {
partition_table::raw::zero_MBR($hd);
} else {
@@ -230,7 +233,7 @@ sub hds {
#- detect raids before LVM allowing LVM on raid
my $raids = raids(\@hds);
- my $all_hds = { %{ empty_all_hds() }, hds => \@hds, lvms => [], raids => $raids };
+ my $all_hds = { %{ empty_all_hds() }, hds => \@hds, raw_hds => \@raw_hds, lvms => [], raids => $raids };
$all_hds->{lvms} = [ lvms($all_hds) ];