skip 2nd resolv_conf in bos_inst

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10570 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
nott 2011-09-20 14:29:05 +00:00
parent ee247f2ed9
commit 909f4a55a5

View File

@ -897,6 +897,12 @@ sub nimnodeset
{
if ($resname)
{
# don't add resolv.conf here!!
# - it is done below
if ($restype eq 'resolv_conf')
{
next;
}
# handle multiple script & installp_bundles
if ($restype eq 'script')
@ -7581,16 +7587,6 @@ sub prenimnodeset
xCAT::MsgUtils->message("E", $rsp, $callback);
return (1);
}
else
{
if ($::VERBOSE)
{
my $rsp;
push @{$rsp->{data}},
"NIM resources are copied to the xCAT service nodes successfully.\n";
xCAT::MsgUtils->message("I", $rsp, $callback);
}
}
# pass this along to the process_request routine
return (0, \%objhash, \%nethash, \%imghash, \%lochash, \%attrs, \%nimhash, \@nodelist, $type);