summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-01-28 16:16:17 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-01-28 16:16:17 +0000
commit48b550858dbfc399fa3d5f9f1aa450c6ab68bf09 (patch)
treed83eacd0a6a0e775bdf6706ef38e60c0d0172bb2
parentc01c70b3db92361f6131064f2f48e8cd4794f481 (diff)
downloaddrakx-48b550858dbfc399fa3d5f9f1aa450c6ab68bf09.tar
drakx-48b550858dbfc399fa3d5f9f1aa450c6ab68bf09.tar.gz
drakx-48b550858dbfc399fa3d5f9f1aa450c6ab68bf09.tar.bz2
drakx-48b550858dbfc399fa3d5f9f1aa450c6ab68bf09.tar.xz
drakx-48b550858dbfc399fa3d5f9f1aa450c6ab68bf09.zip
(configure_eth_aliases) simplify
-rw-r--r--perl-install/network/ethernet.pm4
1 files 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 {