skip 2nd resolv_conf in bos_inst

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.6@10571 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
nott
2011-09-20 14:31:30 +00:00
parent 323fba6ed3
commit eae067c880
+7 -10
View File
@@ -877,6 +877,13 @@ 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')
{
@@ -7493,16 +7500,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);