summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/detect_devices.pm8
1 files changed, 1 insertions, 7 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index dc9f17de2..e3b70cfff 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -167,15 +167,9 @@ sub getDAC960() {
}
sub getNet() {
- my @nets = grep { hasNetDevice($_) } @netdevices;
- $::isStandalone ? grep { !/plip/ } @nets : @nets;
+ grep { !($::isStandalone && /plip/) && c::hasNetDevice($_) } @netdevices;
}
-sub hasNet() { goto &getNet }
-sub hasEthernet() { hasNetDevice("eth0"); }
-sub hasTokenRing() { hasNetDevice("tr0"); }
-sub hasNetDevice($) { c::hasNetDevice($_[0]) }
-
# pci_probing::main::probe with $probe_type is unsafe for pci! (bug in kernel&hardware)
# get_pcmcia_devices provides field "device", used in network.pm
# => probeall with $probe_type is unsafe