diff options
| -rw-r--r-- | perl-install/detect_devices.pm | 12 | ||||
| -rw-r--r-- | perl-install/devices.pm | 5 | ||||
| -rw-r--r-- | perl-install/partition_table.pm | 2 |
3 files changed, 2 insertions, 17 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index c88277691..687ab8b2f 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -74,7 +74,7 @@ sub get() { #- 2. The first SCSI device if SCSI exists. Or #- 3. The first RAID device if RAID exists. - getIDE(), getSCSI(), getMmcBlk(), getXenBlk(), getVirtIO(), getDAC960(), getCompaqSmartArray(), getATARAID(); + getIDE(), getSCSI(), getMmcBlk(), getXenBlk(), getVirtIO(), getDAC960(), getCompaqSmartArray(); } sub hds() { grep { may_be_a_hd($_) } get() } sub tapes() { grep { $_->{media_type} eq 'tape' } get() } @@ -433,16 +433,6 @@ sub getDAC960() { values %idi; } -sub getATARAID() { - my %l; - foreach (syslog()) { - my ($device) = m|^\s*(ataraid/d\d+):| or next; - $l{$device} = { info => 'ATARAID block device', media_type => 'hd', device => $device, bus => 'ataraid' }; - log::l("ATARAID: $device"); - } - values %l; -} - =item getXenBlk() Returns a list of all Xen block devices (C</dev/xvd*>). diff --git a/perl-install/devices.pm b/perl-install/devices.pm index f72efe8e6..19dcb6871 100644 --- a/perl-install/devices.pm +++ b/perl-install/devices.pm @@ -91,11 +91,6 @@ sub entry { $type = c::S_IFBLK(); $major = ($1 eq 'ida' ? 72 : 104) + $2; $minor = 16 * $3 + ($4 || 0); - } elsif (m,(ataraid)/d(\d+)(?:p(\d+))?,) { - # ATA raid "ataraid/d0{p1}" - $type = c::S_IFBLK(); - $major = 114; - $minor = 16 * $1 + ($2 || 0); } elsif (my ($prefix, $nb) = /(.*?)(\d+)$/) { my $f = ${{"fd" => sub { c::S_IFBLK(), 2, 0 }, "hidbp-mse-" => sub { c::S_IFCHR(), 10, 32 }, diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm index 79d108d3d..227417dd5 100644 --- a/perl-install/partition_table.pm +++ b/perl-install/partition_table.pm @@ -560,7 +560,7 @@ The only solution is to move your primary partitions to have the hole next to th sub add { my ($hd, $part, $b_primaryOrExtended, $b_forceNoAdjust) = @_; - get_normal_parts($hd) >= ($hd->{device} =~ /^rd/ ? 7 : $hd->{device} =~ /^(ida|cciss|ataraid)/ ? 15 : 63) and cdie "maximum number of partitions handled by linux reached"; + get_normal_parts($hd) >= ($hd->{device} =~ /^rd/ ? 7 : $hd->{device} =~ /^(ida|cciss)/ ? 15 : 63) and cdie "maximum number of partitions handled by linux reached"; set_isFormatted($part, 0); put_in_hash($part, hd2minimal_part($hd)); |