summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2002-01-08 17:43:48 +0000
committerdamien <damien@mandriva.com>2002-01-08 17:43:48 +0000
commit05fa5ebe0586d029c6e65d037f8b5b3b57df4ce7 (patch)
treea32513d5227e42b99b5c90552c2781f1d1ca5521
parentc5439ea146d8bcceef2d9639af986ac54fded16b (diff)
downloaddrakx-backup-do-not-use-05fa5ebe0586d029c6e65d037f8b5b3b57df4ce7.tar
drakx-backup-do-not-use-05fa5ebe0586d029c6e65d037f8b5b3b57df4ce7.tar.gz
drakx-backup-do-not-use-05fa5ebe0586d029c6e65d037f8b5b3b57df4ce7.tar.bz2
drakx-backup-do-not-use-05fa5ebe0586d029c6e65d037f8b5b3b57df4ce7.tar.xz
drakx-backup-do-not-use-05fa5ebe0586d029c6e65d037f8b5b3b57df4ce7.zip
cosmetik
-rw-r--r--perl-install/install2.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index bde969d1e..c94cd1f6e 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -549,7 +549,8 @@ sub main {
require network;
#- get stage1 network configuration if any.
log::l('found /tmp/network');
- $o->{netc} ||= network::read_conf('/tmp/network');
+ $o->{netc} ||= {};
+ add2hash($o->{netc}, network::read_resolv_conf('/tmp/network'));
if (my ($file) = glob_('/tmp/ifcfg-*')) {
log::l("found network config file $file");
my $l = network::read_interface_conf($file);