nfsv4 support, add -o vers=4 to mount commands if site.useNFSv4onAIX is set

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10869 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
ligc 2011-10-24 11:25:16 +00:00
parent 68dd5e36bd
commit 6fa06563ce
2 changed files with 8 additions and 2 deletions

View File

@ -179,7 +179,13 @@ if ( !(-f "/xcatpost/xcataixpost") || $::opt_c ) {
# get the contents of the /install/postscripts dir on the server
# - mount dir from server and copy files
my $mcmd = "mkdir -p /xcatmnt; mount $servnode:$installdir/postscripts /xcatmnt";
my $mcmd;
if ($ENV{'USENFSV4ONAIX'} && ($ENV{'USENFSV4ONAIX'} =~ /1|Yes|yes|YES|Y|y/))
{
$mcmd = "mkdir -p /xcatmnt; mount -o vers=4 $servnode:$installdir/postscripts /xcatmnt";
} else {
$mcmd = "mkdir -p /xcatmnt; mount $servnode:$installdir/postscripts /xcatmnt";
}
if (&runcmd($mcmd) != 0) {
print "$::sdate xcataixpost: Could not mount $installdir/postscripts from $servnode.\n";
print $::LOG_FILE "$::sdate xcataixpost: Could not mount $installdir/postscripts from $servnode.\n";

View File

@ -91,7 +91,7 @@ if (!$installdir) {
# IPv6, should only use NFS version 4 mount
my $mcmd;
my $snipcmd = "host $servnode";
if ((&runcmd($snipcmd) == 0) && ($::outref =~ /:/))
if (((&runcmd($snipcmd) == 0) && ($::outref =~ /:/)) || ($ENV{'USENFSV4ONAIX'} && ($ENV{'USENFSV4ONAIX'} =~ /1|Yes|yes|YES|Y|y/)))
{
$mcmd = "mkdir -p /xcatmnt; mount -o nolock -o vers=4 $servnode:$installdir/postscripts /xcatmnt";
} else {