diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-09-18 21:42:21 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-09-18 21:42:21 +0000 |
| commit | d1f790931b430a7e632cac0b46313433fec7f998 (patch) | |
| tree | acd811801c15446bdafd7f01b8753746d7f1de81 /perl-install/detect_devices.pm | |
| parent | ee9f3710e10dc30c02816097010c5a27868e33f5 (diff) | |
| download | drakx-backup-do-not-use-d1f790931b430a7e632cac0b46313433fec7f998.tar drakx-backup-do-not-use-d1f790931b430a7e632cac0b46313433fec7f998.tar.gz drakx-backup-do-not-use-d1f790931b430a7e632cac0b46313433fec7f998.tar.bz2 drakx-backup-do-not-use-d1f790931b430a7e632cac0b46313433fec7f998.tar.xz drakx-backup-do-not-use-d1f790931b430a7e632cac0b46313433fec7f998.zip | |
no_comment
Diffstat (limited to 'perl-install/detect_devices.pm')
| -rw-r--r-- | perl-install/detect_devices.pm | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index d62999b4b..88db1cb2d 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -46,7 +46,7 @@ sub cdroms() { if (my @l2 = getIDEBurners()) { require modules; modules::add_alias('scsi_hostadapter', 'ide-scsi'); - my $nb = 1 + max(-1, map { $_->{device} =~ /scd(\d+)/ } @l); + my $nb = 1 + max(-1, map { $_->{device} =~ /scd (\d+)/x } @l); foreach my $b (@l2) { log::l("getIDEBurners: $b"); my ($e) = grep { $_->{device} eq $b } @l or next; @@ -162,15 +162,8 @@ sub getDAC960() { sub getNet() { grep { hasNetDevice($_) } @netdevices; } -sub getPlip() { - foreach (0..2) { - hasNetDevice("plip$_") and log::l("plip$_ will be used for PLIP"), return "plip$_"; - } - undef; -} sub hasNet() { goto &getNet } -sub hasPlip() { goto &getPlip } sub hasEthernet() { hasNetDevice("eth0"); } sub hasTokenRing() { hasNetDevice("tr0"); } sub hasNetDevice($) { c::hasNetDevice($_[0]) } |