From cdce9a028098a29314e336df9dedb7965ce9154e Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 26 May 2004 09:43:58 +0000 Subject: (getNet) reuse c::get_netdevices() --- 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 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"))); -- cgit v1.2.1