From 65ecc0d8319556c26a3c734336f0218641ae23c2 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Tue, 1 Jun 2004 09:56:21 +0000
Subject: (getNet) rollbacl to MDK10.0 detection scheme

---
 perl-install/detect_devices.pm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'perl-install/detect_devices.pm')

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")));
-- 
cgit v1.2.1