diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-01 09:56:21 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-01 09:56:21 +0000 |
| commit | 65ecc0d8319556c26a3c734336f0218641ae23c2 (patch) | |
| tree | f213e3bfb301f712332aa118b2afb450197e291e /perl-install/detect_devices.pm | |
| parent | aafe852dbbc541bd57e979c7d5e5ca160d79efd2 (diff) | |
| download | drakx-65ecc0d8319556c26a3c734336f0218641ae23c2.tar drakx-65ecc0d8319556c26a3c734336f0218641ae23c2.tar.gz drakx-65ecc0d8319556c26a3c734336f0218641ae23c2.tar.bz2 drakx-65ecc0d8319556c26a3c734336f0218641ae23c2.tar.xz drakx-65ecc0d8319556c26a3c734336f0218641ae23c2.zip | |
(getNet) rollbacl to MDK10.0 detection scheme
Diffstat (limited to 'perl-install/detect_devices.pm')
| -rw-r--r-- | perl-install/detect_devices.pm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 0016e077b..3e699ba24 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -493,7 +493,14 @@ sub getECI() { grep { member(sprintf("%04x%04x%04x%04x", $_->{vendor}, $_->{id}, $_->{subvendor}, $_->{subid}), @ids) } usb_probe(); } -sub getNet() { grep { $_ ne 'lo' } c::get_netdevices() } +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 getISDN() { # mapgrep(sub {member (($_[0] =~ /\s*(\w*):/), @netdevices), $1 }, split(/\n/, cat_("/proc/net/dev"))); |