summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-11-12 12:31:23 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-11-12 12:31:23 +0000
commit932b873787f546efa2629bc903988b40b04fb919 (patch)
tree1d3c42f85cdaeeef96e4c507fa09a8f1da804a55 /perl-install/install2.pm
parent7639d230b844648b4d4b6d2ed00830c42a46b1e4 (diff)
downloaddrakx-932b873787f546efa2629bc903988b40b04fb919.tar
drakx-932b873787f546efa2629bc903988b40b04fb919.tar.gz
drakx-932b873787f546efa2629bc903988b40b04fb919.tar.bz2
drakx-932b873787f546efa2629bc903988b40b04fb919.tar.xz
drakx-932b873787f546efa2629bc903988b40b04fb919.zip
fix bogus use of old netwok module instead of network::network
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index f45ae8dbe..9233123c1 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -242,8 +242,8 @@ sub summary {
sub configureNetwork {
my ($_clicked, $_ent_number, $auto) = @_;
#- get current configuration of network device.
- require network;
- eval { network::read_all_conf($o->{prefix}, $o->{netc}, $o->{intf}) };
+ require network::network;
+ eval { network::network::read_all_conf($o->{prefix}, $o->{netc}, $o->{intf}) };
installStepsCall($o, $auto, 'configureNetwork') if !$o->{isUpgrade};
}
#------------------------------------------------------------------------------
@@ -450,16 +450,16 @@ sub main {
#- get stage1 network configuration if any.
log::l('found /tmp/network');
$o->{netc} ||= {};
- add2hash($o->{netc}, network::read_conf('/tmp/network'));
+ add2hash($o->{netc}, network::network::read_conf('/tmp/network'));
if (my ($file) = glob_('/tmp/ifcfg-*')) {
log::l("found network config file $file");
- my $l = network::read_interface_conf($file);
+ my $l = network::network::read_interface_conf($file);
$o->{intf} ||= { $l->{DEVICE} => $l };
}
if (-e '/etc/resolv.conf') {
my $file = '/etc/resolv.conf';
log::l("found network config file $file");
- add2hash($o->{netc}, network::read_resolv_conf($file));
+ add2hash($o->{netc}, network::network::read_resolv_conf($file));
}
}