fix missing resolv_conf

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.6@10500 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
nott
2011-09-12 18:04:55 +00:00
parent 29da171a6e
commit b592346b68
+5 -15
View File
@@ -990,14 +990,10 @@ sub nimnodeset
$arg_string .= "$bnd_string";
}
# see if we have a resolv_conf resource
if ($imagehash{$image_name}{resolv_conf})
{
# could be from the osimage
} elsif ($resolv_conf_hash{$node}) {
# or could be specific resolv_conf res created locally
$arg_string .= "-a resolv_conf=$resolv_conf_hash{$node}" ;
}
# see if we have a resolv_conf resource
if ($resolv_conf_hash{$node}) {
$arg_string .= "-a resolv_conf=$resolv_conf_hash{$node}" ;
}
my $initcmd;
$initcmd = "/usr/sbin/nim -o bos_inst $arg_string $nim_name 2>&1";
@@ -8697,13 +8693,7 @@ sub mkdsklsnode
}
# see if we have a resolv_conf resource
if ($imagehash{$image_name}{resolv_conf})
{
# could be from the osimage
# $arg_string .=
# "-a resolv_conf=$imagehash{$image_name}{resolv_conf} ";
} elsif ($resolv_conf_hash{$node}) {
# or could be specific resolv_conf res created locally
if ($resolv_conf_hash{$node}) {
$arg_string .= " -a resolv_conf=$resolv_conf_hash{$node} " ;
}