summaryrefslogtreecommitdiffstats
path: root/perl-install/network
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-07-20 15:01:53 +0000
committerOlivier Blin <oblin@mandriva.org>2004-07-20 15:01:53 +0000
commit7b228538a65ff70e6de18f0ac22175a79ac43269 (patch)
tree37d76d0547364818902a5978b60c2a05fcb04e65 /perl-install/network
parent95f74df604483af6520bcb69bbfa48a030793226 (diff)
downloaddrakx-backup-do-not-use-7b228538a65ff70e6de18f0ac22175a79ac43269.tar
drakx-backup-do-not-use-7b228538a65ff70e6de18f0ac22175a79ac43269.tar.gz
drakx-backup-do-not-use-7b228538a65ff70e6de18f0ac22175a79ac43269.tar.bz2
drakx-backup-do-not-use-7b228538a65ff70e6de18f0ac22175a79ac43269.tar.xz
drakx-backup-do-not-use-7b228538a65ff70e6de18f0ac22175a79ac43269.zip
use read_net_conf to avoid code duplication
Diffstat (limited to 'perl-install/network')
-rw-r--r--perl-install/network/netconnect.pm5
1 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 2fb9fbdfa..84b7d096c 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -117,9 +117,8 @@ sub real_main {
network::tools::remove_initscript();
init_globals($in);
- $netc->{NET_DEVICE} = $netcnx->{NET_DEVICE} if $netcnx->{NET_DEVICE}; # REDONDANCE with read_conf. FIXME
- $netc->{NET_INTERFACE} = $netcnx->{NET_INTERFACE} if $netcnx->{NET_INTERFACE}; # REDONDANCE with read_conf. FIXME
- network::network::read_all_conf($::prefix, $netc, $intf);
+
+ network::network::read_net_conf($netcnx, $netc, $intf);
modules::mergein_conf();