summaryrefslogtreecommitdiffstats
path: root/perl-install/network
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/network')
-rw-r--r--perl-install/network/drakfirewall.pm6
-rw-r--r--perl-install/network/ethernet.pm5
2 files changed, 9 insertions, 2 deletions
diff --git a/perl-install/network/drakfirewall.pm b/perl-install/network/drakfirewall.pm
index 7c9450107..8b22c3001 100644
--- a/perl-install/network/drakfirewall.pm
+++ b/perl-install/network/drakfirewall.pm
@@ -61,6 +61,12 @@ my @all_servers =
ports => '8/icmp',
force_default_selection => 0,
},
+ {
+ name => "BitTorrent",
+ ports => '6881:6999/tcp',
+ hide => 1,
+ pkg => 'bittorrent bittorrent-shadowsclient',
+ },
);
sub port2server {
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 845d7b3d8..193bbf539 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -39,7 +39,8 @@ sub mapIntfToDevice {
my ($interface) = @_;
my $hw_addr = c::getHwIDs($interface);
my ($bus, $slot, $func) = map { hex($_) } ($hw_addr =~ /([0-9a-f]+):([0-9a-f]+)\.([0-9a-f]+)/);
- $hw_addr ? grep { $_->{pci_bus} == $bus && $_->{pci_device} == $slot && $_->{pci_function} == $func } detect_devices::probeall() : {};
+ $hw_addr && (every { defined $_ } $bus, $slot, $func) ?
+ grep { $_->{pci_bus} == $bus && $_->{pci_device} == $slot && $_->{pci_function} == $func } detect_devices::probeall() : {};
}
@@ -63,7 +64,7 @@ sub get_eth_cards() {
}
if (!$description) {
my @cards = grep { $_->{driver} eq ($a || $saved_driver) } detect_devices::probeall();
- $description = $cards[0]{descripxtion} if @cards == 1;
+ $description = $cards[0]->{description} if $#cards == 0;
}
$a and $saved_driver = $a; # handle multiple cards managed by the same driver
[ $interface, $saved_driver, if_($description, $description) ]