From 48b550858dbfc399fa3d5f9f1aa450c6ab68bf09 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Fri, 28 Jan 2005 16:16:17 +0000
Subject: (configure_eth_aliases) simplify

---
 perl-install/network/ethernet.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 84d828a41..0c23b66a9 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -120,9 +120,9 @@ sub update_iftab() {
 # automatic net aliases configuration
 sub configure_eth_aliases {
     my ($modules_conf) = @_;
-    my @pcmcia = detect_devices::pcmcia_probe();
+    my @pcmcia_interfaces = map { $_->{device} } detect_devices::pcmcia_probe();
     foreach my $card (get_eth_cards($modules_conf)) {
-        if (any { $_->{device} eq $card->[0] } @pcmcia) {
+        if (member($card->[0], @pcmcia_interfaces)) {
             #- do not write aliases for pcmcia cards, or cardmgr will not be loaded
             $modules_conf->remove_alias($card->[0]);
         } else {
-- 
cgit v1.2.1