summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-05-26 09:43:58 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-05-26 09:43:58 +0000
commitcdce9a028098a29314e336df9dedb7965ce9154e (patch)
treee63b5b45dc8bcb7339f4142c3f91e244da2fd8db
parentfcf597bc93e1aa48d0a3997d3501f32939acbb6e (diff)
downloaddrakx-cdce9a028098a29314e336df9dedb7965ce9154e.tar
drakx-cdce9a028098a29314e336df9dedb7965ce9154e.tar.gz
drakx-cdce9a028098a29314e336df9dedb7965ce9154e.tar.bz2
drakx-cdce9a028098a29314e336df9dedb7965ce9154e.tar.xz
drakx-cdce9a028098a29314e336df9dedb7965ce9154e.zip
(getNet) reuse c::get_netdevices()
-rw-r--r--perl-install/detect_devices.pm9
1 files changed, 1 insertions, 8 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index d70391d80..00c594adf 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -493,14 +493,7 @@ sub getECI() {
grep { member(sprintf("%04x%04x%04x%04x", $_->{vendor}, $_->{id}, $_->{subvendor}, $_->{subid}), @ids) } usb_probe();
}
-sub getNet() {
- grep { !($::isStandalone && /plip/) && c::hasNetDevice($_) }
- grep { /^(ath|br|eth|fddi|plip|tap|tr|usb|wifi|wlan)/ }
- map_index {
- # skip headers
- if_(1 < $::i && /^\s*([a-z]*[0-9]*):/, $1)
- } cat_("/proc/net/dev");
-}
+sub getNet() { c::get_netdevices() }
#sub getISDN() {
# mapgrep(sub {member (($_[0] =~ /\s*(\w*):/), @netdevices), $1 }, split(/\n/, cat_("/proc/net/dev")));