From 0311b2a15391c1b939f01bf665ce16b449b805ba Mon Sep 17 00:00:00 2001 From: ligc Date: Wed, 21 Mar 2012 02:21:25 +0000 Subject: [PATCH] fix for bug 3509543: mknimimage -u nfs_vers=4 to work with multiple installp_bundles git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@11918 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/aixinstall.pm | 23 ++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/aixinstall.pm b/xCAT-server/lib/xcat/plugins/aixinstall.pm index ede12d772..53b264692 100644 --- a/xCAT-server/lib/xcat/plugins/aixinstall.pm +++ b/xCAT-server/lib/xcat/plugins/aixinstall.pm @@ -2920,19 +2920,22 @@ sub mknimimage my $ninresname = $imagedef{$::image_name}{$nimres}; if ($ninresname) { - push @nimresupdated, $ninresname; - my $nimcmd = qq~nim -Fo change -a nfs_vers=4 $ninresname~; - my $nimout = xCAT::InstUtils->xcmd($callback, $subreq, "xdsh", $nimprime, $nimcmd,0); - if ($::RUNCMD_RC != 0) + foreach my $res2update (split /,/, $ninresname) { - my $rsp; - push @{$rsp->{data}}, "Could not set nfs_vers=4 for resource $ninresname.\n"; - if ($::VERBOSE) + push @nimresupdated, $res2update; + my $nimcmd = qq~nim -Fo change -a nfs_vers=4 $res2update~; + my $nimout = xCAT::InstUtils->xcmd($callback, $subreq, "xdsh", $nimprime, $nimcmd,0); + if ($::RUNCMD_RC != 0) { - push @{$rsp->{data}}, "$nimout"; + my $rsp; + push @{$rsp->{data}}, "Could not set nfs_vers=4 for resource $res2update.\n"; + if ($::VERBOSE) + { + push @{$rsp->{data}}, "$nimout"; + } + xCAT::MsgUtils->message("E", $rsp, $callback); + return 1; } - xCAT::MsgUtils->message("E", $rsp, $callback); - return 1; } } }