Dont have mknimimage create resolv_conf by default
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2506 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
		| @@ -723,7 +723,7 @@ ll~; | ||||
|  | ||||
| 	# update the node definitions with the new osimage - if provided | ||||
| 	my %nodeattrs; | ||||
| 	foreach my $node (@nodelist) { | ||||
| 	foreach my $node (keys %objhash) { | ||||
|         chomp $node; | ||||
|  | ||||
|         if (!grep(/^$node$/, @nodesfailed)) { | ||||
| @@ -1268,20 +1268,6 @@ sub mknimimage | ||||
|             return 1; | ||||
|         } | ||||
|  | ||||
| 		# | ||||
|         # create resolv_conf | ||||
| 		# | ||||
| 		$resolv_conf_name = &mk_resolv_conf($callback); | ||||
|         chomp $resolv_conf_name; | ||||
|         $newres{resolv_conf} = $resolv_conf_name; | ||||
|         if ( !defined($resolv_conf_name)) { | ||||
|             # error | ||||
| 			my $rsp; | ||||
|             push @{$rsp->{data}}, "Could not create resolv_conf definition.\n"; | ||||
|             xCAT::MsgUtils->message("E", $rsp, $callback); | ||||
|             return 1; | ||||
|         } | ||||
|  | ||||
| 		if ($::METHOD eq "rte" ) { | ||||
|  | ||||
| 			# need lpp_source, spot, resolv_conf, & bosinst_data | ||||
| @@ -4256,7 +4242,7 @@ ll~; | ||||
| 	# update the node definitions with the new osimage - if provided | ||||
| 	# | ||||
| 	my %nodeattrs; | ||||
| 	foreach my $node (@nodelist) { | ||||
| 	foreach my $node (keys %objhash) { | ||||
|         chomp $node; | ||||
|         if (!grep(/^$node$/, @nodesfailed)) { | ||||
|             # change the node def if we were successful | ||||
|   | ||||
		Reference in New Issue
	
	Block a user