diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-03-02 18:11:24 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-03-02 18:11:24 +0000 |
| commit | 221e7944db551edf85e0c0ff6062155b643a6d23 (patch) | |
| tree | f294e2757f409c7662aca923efa86a28d11fe3e9 /perl-install | |
| parent | 0a6678837ce51a3086ec07bac3be9706240a8562 (diff) | |
| download | drakx-221e7944db551edf85e0c0ff6062155b643a6d23.tar drakx-221e7944db551edf85e0c0ff6062155b643a6d23.tar.gz drakx-221e7944db551edf85e0c0ff6062155b643a6d23.tar.bz2 drakx-221e7944db551edf85e0c0ff6062155b643a6d23.tar.xz drakx-221e7944db551edf85e0c0ff6062155b643a6d23.zip | |
(getCompaqSmartArray): adapt for cciss
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/detect_devices.pm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 238e65893..d360c55cc 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -126,17 +126,17 @@ sub getIDE() { sub getCompaqSmartArray() { my @idi; - my $f; - my $dir = "/proc/driver/array"; #- kernel 2.4 places it here - $dir = "/proc/array" if !-d $dir; #- kernel 2.2 + foreach ('array/ida', 'cciss/cciss') { + my $prefix = "/proc/driver/$_"; #- kernel 2.4 places it here + $prefix = "/proc/$_" if !-e "${prefix}0"; #- kernel 2.2 - -e "$dir/ida0" or return; - - for (my $i = 0; -r ($f = "$dir/ida$i"); $i++) { - foreach (cat_($f)) { - if (m|^\s*(ida/.*?):|) { - push @idi, { device => $1, info => "Compaq RAID logical disk", type => 'hd' }; + 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", type => 'hd' }; + } } } } |