From 285bca65e8fc96d8063c5e13a78cfbbfb9f3fdb5 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 3 Jan 2006 13:13:01 +0000 Subject: (get_eth_cards) simplify --- perl-install/network/ethernet.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm index 86d85c7c6..c97f45f1c 100644 --- a/perl-install/network/ethernet.pm +++ b/perl-install/network/ethernet.pm @@ -85,9 +85,8 @@ sub get_eth_cards { my $drv = readlink("$dev_path/driver"); if ($drv && $drv =~ s!.*/!!) { $a = $drv unless $detected_through_ethtool; - my %l; my $sysfs_fields = detect_devices::get_sysfs_device_id_map($dev_path); - $l{$_} = hex(chomp_(cat_("$dev_path/" . $sysfs_fields->{$_}))) foreach keys %$sysfs_fields; + my %l = map { $_ => hex(chomp_(cat_("$dev_path/" . $sysfs_fields->{$_}))) } keys %$sysfs_fields; my @cards = grep { my $dev = $_; every { $dev->{$_} eq $l{$_} } keys %l } detect_devices::probeall(); $description ||= $cards[0]{description} if @cards == 1; } elsif (!$a && -e "/sys/class/net/$interface/wireless") { -- cgit v1.2.1