From efffec1492b7affce13e0437e6bbca5a76112370 Mon Sep 17 00:00:00 2001 From: nott Date: Tue, 18 Nov 2008 20:14:05 +0000 Subject: [PATCH] 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 --- xCAT-server/lib/xcat/plugins/aixinstall.pm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/aixinstall.pm b/xCAT-server/lib/xcat/plugins/aixinstall.pm index 4e49e374e..db85b6e49 100644 --- a/xCAT-server/lib/xcat/plugins/aixinstall.pm +++ b/xCAT-server/lib/xcat/plugins/aixinstall.pm @@ -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