summaryrefslogtreecommitdiffstats
path: root/perl-install/network/ethernet.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-26 16:23:46 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-26 16:23:46 +0000
commit994b1c073c35d48631ad1521773d762ff8a2331e (patch)
tree78725b9d646e570780055a0d4f05738d0d58b600 /perl-install/network/ethernet.pm
parentd7c8df1e16e5c95036616d2e2e89df5c8a528ae4 (diff)
downloaddrakx-994b1c073c35d48631ad1521773d762ff8a2331e.tar
drakx-994b1c073c35d48631ad1521773d762ff8a2331e.tar.gz
drakx-994b1c073c35d48631ad1521773d762ff8a2331e.tar.bz2
drakx-994b1c073c35d48631ad1521773d762ff8a2331e.tar.xz
drakx-994b1c073c35d48631ad1521773d762ff8a2331e.zip
get rid of pseudo global $prefix, just reuse global $::prefix :-)
Diffstat (limited to 'perl-install/network/ethernet.pm')
-rw-r--r--perl-install/network/ethernet.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 26a58a9af..fc9f8da44 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -10,7 +10,7 @@ use run_program;
use network::tools;
use vars qw(@ISA @EXPORT);
-use MDK::Common::Globals "network", qw($in $prefix);
+use MDK::Common::Globals "network", qw($in);
@ISA = qw(Exporter);
@EXPORT = qw(conf_network_card_backend);
@@ -20,8 +20,8 @@ my (@cards, @ether_steps, $last, %last);
sub ether_conf{
# my ($netcnx, $netc, $intf, $first_time) = @_;
- my ($in, $prefix, $netc, $intf) = @_;
- configureNetwork2($in, $prefix, $netc, $intf);
+ my ($in, $_prefix, $netc, $intf) = @_;
+ configureNetwork2($in, $::prefix, $netc, $intf);
$netc->{NETWORKING} = "yes";
if ($netc->{GATEWAY} || any { $_->{BOOTPROTO} =~ /dhcp/ } values %$intf) {
$netcnx->{type} = 'lan';
@@ -69,7 +69,7 @@ sub conf_network_card_backend {
my @all_cards = detect_devices::getNet();
my @devs = detect_devices::pcmcia_probe();
- modules::mergein_conf("$prefix/etc/modules.conf");
+ modules::mergein_conf("$::prefix/etc/modules.conf");
my $saved_driver;
return map {
my $interface = $_;