From 974fbdbe97d509032bbccebe037257081972c579 Mon Sep 17 00:00:00 2001 From: nott Date: Wed, 9 May 2012 14:36:43 +0000 Subject: [PATCH] fix merge error git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@12585 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/aixinstall.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/aixinstall.pm b/xCAT-server/lib/xcat/plugins/aixinstall.pm index 69e830580..c604cfc5b 100644 --- a/xCAT-server/lib/xcat/plugins/aixinstall.pm +++ b/xCAT-server/lib/xcat/plugins/aixinstall.pm @@ -9735,14 +9735,14 @@ sub mkdsklsnode # # See if we need to create a resolv_conf resource # - my %RChash; - %RChash = &chk_resolv_conf($callback, \%objhash, \@nodelist, \%nethash, \%imagehash, \%attrs, \%nodeosi, $subreq); - if ( !%RChash ){ + my $RChash; + $RChash = &chk_resolv_conf($callback, \%objhash, \@nodelist, \%nethash, \%imagehash, \%attrs, \%nodeosi, $subreq); + if ( !$RChash ){ my $rsp; push @{$rsp->{data}}, "Could not check NIM resolv_conf resource.\n"; xCAT::MsgUtils->message("E", $rsp, $callback); } - my %resolv_conf_hash = %RChash; + my %resolv_conf_hash = %{$RChash}; # # define and initialize the diskless/dataless nodes