summaryrefslogtreecommitdiffstats
path: root/perl-install/detect_devices.pm
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/detect_devices.pm')
-rw-r--r--perl-install/detect_devices.pm7
1 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 455269ba4..11115cc35 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -417,7 +417,12 @@ sub getSagem() {
}
sub getNet() {
- grep { /^(eth|fddi|plip|tr|wifi|wlan)/ } c::getNetInterfaces();
+ grep { !(($::isStandalone || $::live) && /plip/) && c::hasNetDevice($_) }
+ grep { /^(eth|fddi|plip|tr|wifi|wlan)/ }
+ map_index {
+ # skip headers
+ if_(1 < $::i && /^\s*([a-z]*[0-9]*):/, $1)
+ } cat_("/proc/net/dev");
}
#sub getISDN() {