summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-03-02 12:22:12 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-03-02 12:22:12 +0000
commite97e40d422337b0b1b0006dfb1ff1c44f0b9718a (patch)
tree09f094e5a71ac386dc863f06c842934462631b5a
parentf919ccd199f16e8c104f4038b5b998aef43596e0 (diff)
downloaddrakx-e97e40d422337b0b1b0006dfb1ff1c44f0b9718a.tar
drakx-e97e40d422337b0b1b0006dfb1ff1c44f0b9718a.tar.gz
drakx-e97e40d422337b0b1b0006dfb1ff1c44f0b9718a.tar.bz2
drakx-e97e40d422337b0b1b0006dfb1ff1c44f0b9718a.tar.xz
drakx-e97e40d422337b0b1b0006dfb1ff1c44f0b9718a.zip
fix ide zip name when there are already some other SCSI drives
-rw-r--r--perl-install/detect_devices.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index e14e2f324..82cf132bb 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -63,10 +63,11 @@ sub zips__faking_ide_scsi {
if (my @l_ide = grep { $_->{interface_type} eq 'ide' } @l) {
require modules;
modules::add_alias('scsi_hostadapter', 'ide-scsi');
- my $nb = 1 + max(-1, map { if_($_->{device} =~ /sd(\s+)/, ord($1) - ord('a')) } getSCSI());
+ my $nb = 1 + max(-1, map { if_($_->{device} =~ /sd(\w+)/, ord($1) - ord('a')) } getSCSI());
foreach my $e (@l_ide) {
- log::l("IDE Zip: $e->{device}");
- $e->{device} = "sd" . chr(ord('a') + $nb++);
+ my $faked = "sd" . chr(ord('a') + $nb++);
+ log::l("IDE Zip: $e->{device} => $faked");
+ $e->{device} = $faked;
}
}
map { $_->{device} .= 4; $_ } @l;