From d1f790931b430a7e632cac0b46313433fec7f998 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 18 Sep 2000 21:42:21 +0000
Subject: no_comment

---
 perl-install/detect_devices.pm | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'perl-install/detect_devices.pm')

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]) }
-- 
cgit v1.2.1