summaryrefslogtreecommitdiffstats
path: root/perl-install/network
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-26 22:15:42 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-26 22:15:42 +0000
commitf29199945cb7381f137b5f62102e7fce67146a34 (patch)
tree68054fe7d60e824efb46e447cc5496f3297708cc /perl-install/network
parent339107572c06177bdfed627cb70d98eac72f31c1 (diff)
downloaddrakx-f29199945cb7381f137b5f62102e7fce67146a34.tar
drakx-f29199945cb7381f137b5f62102e7fce67146a34.tar.gz
drakx-f29199945cb7381f137b5f62102e7fce67146a34.tar.bz2
drakx-f29199945cb7381f137b5f62102e7fce67146a34.tar.xz
drakx-f29199945cb7381f137b5f62102e7fce67146a34.zip
cleanups
Diffstat (limited to 'perl-install/network')
-rw-r--r--perl-install/network/ethernet.pm11
1 files changed, 4 insertions, 7 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index b1b768652..ee74e16bb 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -15,12 +15,9 @@ use MDK::Common::Globals "network", qw($in);
@ISA = qw(Exporter);
@EXPORT = qw(conf_network_card_backend);
-my (@cards, @ether_steps, $last, %last);
-
-
-sub ether_conf{
- # my ($netcnx, $netc, $intf, $first_time) = @_;
- my ($in, $_prefix, $netc, $intf) = @_;
+# FIXME: unused code to merge in into wizard
+sub ether_conf {
+ my ($in, $netcnx, $netc, $intf) = @_;
configureNetwork2($in, $::prefix, $netc, $intf);
$netc->{NETWORKING} = "yes";
if ($netc->{GATEWAY} || any { $_->{BOOTPROTO} =~ /dhcp/ } values %$intf) {
@@ -43,7 +40,7 @@ qq(
sub mapIntfToDevice {
my ($interface) = @_;
- my ($bus, $slot, $func) = map { hex($_) } (c::getHwIDs("eth0") =~ /([0-9a-f])+:([0-9a-f])+\.([0-9a-f]+)/);
+ my ($bus, $slot, $_func) = map { hex($_) } (c::getHwIDs("eth0") =~ /([0-9a-f])+:([0-9a-f])+\.([0-9a-f]+)/);
grep { $_->{pci_bus} == $bus && $_->{pci_device} == $slot } detect_devices::probeall();
}