summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-06-03 08:34:06 +0000
committerOlivier Blin <oblin@mandriva.org>2005-06-03 08:34:06 +0000
commit5023a9309e1bb6419cc6b718efb6bd4e82a3d634 (patch)
tree4b0f30ae312953269eadc6efff74027677b9c938 /perl-install/install2.pm
parent1181b5a61a8aa93e03abeeab3b27e8b745c07e13 (diff)
downloaddrakx-5023a9309e1bb6419cc6b718efb6bd4e82a3d634.tar
drakx-5023a9309e1bb6419cc6b718efb6bd4e82a3d634.tar.gz
drakx-5023a9309e1bb6419cc6b718efb6bd4e82a3d634.tar.bz2
drakx-5023a9309e1bb6419cc6b718efb6bd4e82a3d634.tar.xz
drakx-5023a9309e1bb6419cc6b718efb6bd4e82a3d634.zip
$o->{net}{network} and $o->{net}{resolv} may not exist at this stage of installation (they are created by read_net_conf), create them if needed
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 9b76bb651..64ce3f2e2 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -484,7 +484,7 @@ sub main {
#- get stage1 network configuration if any.
log::l('found /tmp/network');
#- FIXME: DOMAINNAME and DHCP_HOSTNAME shouldn't be in $o->{net}{network}
- add2hash($o->{net}{network}, network::network::read_conf('/tmp/network'));
+ add2hash($o->{net}{network} ||= {}, network::network::read_conf('/tmp/network'));
if (my ($file) = glob_('/tmp/ifcfg-*')) {
log::l("found network config file $file");
my $l = network::network::read_interface_conf($file);
@@ -493,7 +493,7 @@ sub main {
if (-e '/etc/resolv.conf') {
my $file = '/etc/resolv.conf';
log::l("found network config file $file");
- add2hash($o->{net}{resolv}, network::network::read_resolv_conf($file));
+ add2hash($o->{net}{resolv} ||= {}, network::network::read_resolv_conf($file));
}
}