From 932b873787f546efa2629bc903988b40b04fb919 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 12 Nov 2003 12:31:23 +0000 Subject: fix bogus use of old netwok module instead of network::network --- perl-install/install2.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'perl-install/install2.pm') 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)); } } -- cgit v1.2.1