diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-05-28 08:21:15 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-05-28 08:21:15 +0000 |
| commit | 7db099c14da7fde27be0cd6dbe0bf79183420a4f (patch) | |
| tree | 646b1d606c8f0c60d18d54b43861e099a93c21cd /perl-install/detect_devices.pm | |
| parent | bb5d5f6f9a104490f1d4497a091d3ed9adac0ca2 (diff) | |
| download | drakx-7db099c14da7fde27be0cd6dbe0bf79183420a4f.tar drakx-7db099c14da7fde27be0cd6dbe0bf79183420a4f.tar.gz drakx-7db099c14da7fde27be0cd6dbe0bf79183420a4f.tar.bz2 drakx-7db099c14da7fde27be0cd6dbe0bf79183420a4f.tar.xz drakx-7db099c14da7fde27be0cd6dbe0bf79183420a4f.zip | |
merge fixes from HEAD
Diffstat (limited to 'perl-install/detect_devices.pm')
| -rw-r--r-- | perl-install/detect_devices.pm | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 3e699ba24..0016e077b 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|eth|fddi|plip|tr|usb|wifi|wlan)/ } - map_index { - # skip headers - if_(1 < $::i && /^\s*([a-z]*[0-9]*):/, $1) - } cat_("/proc/net/dev"); -} +sub getNet() { grep { $_ ne 'lo' } c::get_netdevices() } #sub getISDN() { # mapgrep(sub {member (($_[0] =~ /\s*(\w*):/), @netdevices), $1 }, split(/\n/, cat_("/proc/net/dev"))); |