diff options
author | Thierry Vignaud <tvignaud@mandriva.org> | 2003-11-05 13:35:18 +0000 |
---|---|---|
committer | Thierry Vignaud <tvignaud@mandriva.org> | 2003-11-05 13:35:18 +0000 |
commit | ccf9e0bd81af00cf55b663a518f82a866d9b64a9 (patch) | |
tree | 2b6f4c036ff01a529043ef1944b32968ce55cb86 | |
parent | 4022d5f26b22c02a995540a3a7d5453226082ed4 (diff) | |
download | drakx-ccf9e0bd81af00cf55b663a518f82a866d9b64a9.tar drakx-ccf9e0bd81af00cf55b663a518f82a866d9b64a9.tar.gz drakx-ccf9e0bd81af00cf55b663a518f82a866d9b64a9.tar.bz2 drakx-ccf9e0bd81af00cf55b663a518f82a866d9b64a9.tar.xz drakx-ccf9e0bd81af00cf55b663a518f82a866d9b64a9.zip |
detect all up||down interfaces w/o any hardcoded limits:
- rollback to old active poll on existing interfaces rather than
relying on kernel interfaces list (since it does not list
unconfigured interfaces)
- get the network interfaces list from /proc/net/dev (reusing the same
logic as from "ifconfig -a")
-rw-r--r-- | perl-install/detect_devices.pm | 7 |
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() { |