diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-08-27 22:04:08 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-08-27 22:04:08 +0000 |
| commit | c0667d6fc71454925b5ae6a56477a8cc2fa76d22 (patch) | |
| tree | 70f72b8e35f49bb2420cb0d517be782e874a262e /perl-install/detect_devices.pm | |
| parent | c21f6d2d213e2abb698c1add1d1aba7549ab2de6 (diff) | |
| download | drakx-c0667d6fc71454925b5ae6a56477a8cc2fa76d22.tar drakx-c0667d6fc71454925b5ae6a56477a8cc2fa76d22.tar.gz drakx-c0667d6fc71454925b5ae6a56477a8cc2fa76d22.tar.bz2 drakx-c0667d6fc71454925b5ae6a56477a8cc2fa76d22.tar.xz drakx-c0667d6fc71454925b5ae6a56477a8cc2fa76d22.zip | |
set {prefix} for rd/ida/cciss/... (instead of doing it in fsedit::hds)
Diffstat (limited to 'perl-install/detect_devices.pm')
| -rw-r--r-- | perl-install/detect_devices.pm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 1a0aba020..f7522f79c 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -274,8 +274,9 @@ sub getCompaqSmartArray() { my ($name) = m|/(.*)|; for (my $i = 0; -r ($f = "${prefix}$i"); $i++) { foreach (cat_($f)) { - if (m|^\s*($name/.*?):|) { - push @idi, { device => $1, info => "Compaq RAID logical disk", media_type => 'hd', bus => 'ida' }; + if (my ($device) = m|^\s*($name/.*?):|) { + push @idi, { device => $device, prefix => $device . 'p', info => "Compaq RAID logical disk", + media_type => 'hd', bus => 'ida' }; } } } @@ -290,7 +291,7 @@ sub getDAC960() { #- /dev/rd/c0d0: RAID-7, Online, 17928192 blocks, Write Thru0123456790123456789012 foreach (syslog()) { my ($device, $info) = m|/dev/(rd/.*?): (.*?),| or next; - $idi{$device} = { info => $info, media_type => 'hd', device => $device, bus => 'dac960' }; + $idi{$device} = { info => $info, media_type => 'hd', device => $device, prefix => $device . 'p', bus => 'dac960' }; } values %idi; } @@ -299,7 +300,7 @@ 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' }; + $l{$device} = { info => 'ATARAID block device', media_type => 'hd', device => $device, prefix => $device . 'p', bus => 'ataraid' }; log::l("ATARAID: $device"); } values %l; |