summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-03-19 09:06:44 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-03-19 09:06:44 +0000
commita4a52e9642c2fc5c2349de0b43cab3c6ba7385ef (patch)
tree941965cdb93f6d057405f7c77f06f6137fc8c539
parent1b503bf30c171499458c3f8d811a6fbb9c9b5362 (diff)
downloaddrakx-a4a52e9642c2fc5c2349de0b43cab3c6ba7385ef.tar
drakx-a4a52e9642c2fc5c2349de0b43cab3c6ba7385ef.tar.gz
drakx-a4a52e9642c2fc5c2349de0b43cab3c6ba7385ef.tar.bz2
drakx-a4a52e9642c2fc5c2349de0b43cab3c6ba7385ef.tar.xz
drakx-a4a52e9642c2fc5c2349de0b43cab3c6ba7385ef.zip
adapt to devfs (?) naming which breaks compatibility (bugzilla #9029)
-rw-r--r--perl-install/detect_devices.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 2ab37b790..cc13ab7fb 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -310,8 +310,9 @@ sub getCompaqSmartArray() {
my ($name) = m|/(.*)|;
for (my $i = 0; -r ($f = "${prefix}$i"); $i++) {
foreach (cat_($f)) {
- if (my ($device) = m|^\s*($name/.*?):|) {
- push @idi, { device => $device, prefix => $device . 'p', info => "Compaq RAID logical disk",
+ if (my ($raw_device) = m|^\s*($name/.*?):|) {
+ my $device = -d "/dev/$raw_device" ? "$raw_device/disc" : $raw_device;
+ push @idi, { device => $device, prefix => $raw_device . 'p', info => "Compaq RAID logical disk",
media_type => 'hd', bus => 'ida' };
}
}