arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix for bug 3484773: mknimimage -u nfs_vers=4 to handle image_data and resolv_conf

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11595 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
ligc 2012-02-16 05:48:37 +00:00
parent 66de9934d4
commit f39c709479
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
xCAT-server/lib/xcat/plugins/aixinstall.pm
View File

@ -2879,33 +2879,36 @@ sub mknimimage
my @nimresupdated = ();
if ($imagedef{$::image_name}{nimtype} eq "standalone")
{
@nimrestoupdate = ("lpp_source", "spot", "bosinst_data", "installp_bundle");
@nimrestoupdate = ("lpp_source", "spot", "bosinst_data", "installp_bundle", "image_data", "resolv_conf");
}
if (($imagedef{$::image_name}{nimtype} eq "diskless") && $imagedef{$::image_name}{root})
{
@nimrestoupdate = ("lpp_source", "spot", "installp_bundle", "root", "paging");
@nimrestoupdate = ("lpp_source", "spot", "installp_bundle", "root", "paging", "resolv_conf");
}
if (($imagedef{$::image_name}{nimtype} eq "diskless") && $imagedef{$::image_name}{shared_root})
{
@nimrestoupdate = ("lpp_source", "spot", "installp_bundle", "shared_root", "paging");
@nimrestoupdate = ("lpp_source", "spot", "installp_bundle", "shared_root", "paging", "resolv_conf");
}
foreach my $nimres (@nimrestoupdate)
{
my $ninresname = $imagedef{$::image_name}{$nimres};
push @nimresupdated, $ninresname;
my $nimcmd = qq~nim -o change -a nfs_vers=4 $ninresname~;
my $nimout = xCAT::InstUtils->xcmd($callback, $subreq, "xdsh", $nimprime, $nimcmd,0);
if ($::RUNCMD_RC != 0)
if ($ninresname)
{
my $rsp;
push @{$rsp->{data}}, "Could not set nfs_vers=4 for resource $ninresname.\n";
if ($::VERBOSE)
push @nimresupdated, $ninresname;
my $nimcmd = qq~nim -o change -a nfs_vers=4 $ninresname~;
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 $ninresname.\n";
if ($::VERBOSE)
{
push @{$rsp->{data}}, "$nimout";
}
xCAT::MsgUtils->message("E", $rsp, $callback);
return 1;
}
xCAT::MsgUtils->message("E", $rsp, $callback);
return 1;
}
}
if ($::VERBOSE)