summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-11-14 17:46:05 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-11-14 17:46:05 +0000
commita848b4b877d2c5933328b37d6a1bb1793281026d (patch)
tree6938a817884633dcc54e6b49ff4751da480e5e81
parentb8af68bc93d9a637641e104cb23efc28b0adca4b (diff)
downloaddrakx-a848b4b877d2c5933328b37d6a1bb1793281026d.tar
drakx-a848b4b877d2c5933328b37d6a1bb1793281026d.tar.gz
drakx-a848b4b877d2c5933328b37d6a1bb1793281026d.tar.bz2
drakx-a848b4b877d2c5933328b37d6a1bb1793281026d.tar.xz
drakx-a848b4b877d2c5933328b37d6a1bb1793281026d.zip
fix bogus use of old netwok module instead of network::network (missed when
cleaning up this)
-rw-r--r--perl-install/install2.pm2
-rw-r--r--perl-install/network/netconnect.pm4
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index d898690df..47b519607 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -447,7 +447,7 @@ sub main {
#- done before auto_install is called to allow the -IP feature on auto_install file name
if (-e '/tmp/network') {
- require network;
+ require network::network;
#- get stage1 network configuration if any.
log::l('found /tmp/network');
$o->{netc} ||= {};
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index cdfd75425..9faf60002 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -8,7 +8,7 @@ use run_program;
use modules;
use any;
use mouse;
-use network;
+use network::network;
use network::tools;
use MDK::Common::Globals "network", qw($in $prefix $connect_file $disconnect_file $connect_prog);
@@ -300,7 +300,7 @@ sub load_conf {
my $current = { getVarsFromSh("$prefix/etc/netprofile/current") };
$netcnx->{PROFILE} = $current->{PROFILE} || 'default';
- network::read_all_conf($prefix, $netc, $intf);
+ network::network::read_all_conf($prefix, $netc, $intf);
}
sub get_net_device() {