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

use new interface to makescript

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16337 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav
2013-05-16 17:07:05 +00:00
parent c45ed81db3
commit 99a88822e3
1 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
xCAT-server/lib/xcat/plugins/getpostscript.pm
View File

@@ -80,34 +80,26 @@ sub process_request
my $args = $request->{arg};
my @scriptcontents;
my $version =0;
# make the mypostscript.<nodename> file
# or the mypostscript.<nodename>.tmp file if precreatemypostscripts=0
# right now @scriptcontents is null
@scriptcontents = xCAT::Postage::makescript([$client],$state,$callback);
if( defined($args) && grep(/version2/, @$args)) {
$version =2
}
# for version=2, we do not return the created mypostscript file.
# xcatdsklspost must wget
# If not version=2, then we return the mypostscript file buffer.
my $notmpfiles;
my $nofiles;
# If not version=2, then we return the mypostscript file in an array.
if ($version != 2) {
my $filename="mypostscript.$client";
my $cmd;
if (!(-e $filename)) {
$filename="mypostscript.$client.tmp";
}
$cmd="cat /tftpboot/mypostscripts/$filename";
@scriptcontents = xCAT::Utils->runcmd($cmd,0);
if ($::RUNCMD_RC != 0)
{
my $rsp = {};
$rsp->{error}->[0] = "Command: $cmd failed.";
xCAT::MsgUtils->message("S", $rsp, $::CALLBACK);
}
$notmpfiles=0; # does not matter not making files
$nofiles=1; # do not create /tftpboot/mypostscript/mypostscript.<nodename>
@scriptcontents = xCAT::Postage::makescript([$client],$state,$callback,$notmpfiles,$nofiles);
`logger -t xCAT -p local4.info "getpostscript: sending data"` ;
$rsp->{data} = \@scriptcontents;
$callback->($rsp);
} else { # version 2, make files, do not return array
# make the mypostscript.<nodename> file
# or the mypostscript.<nodename>.tmp file if precreatemypostscripts=0
# xcatdsklspost will wget the file
$notmpfiles=0;
$nofiles=0;
xCAT::Postage::makescript([$client],$state,$callback,$notmpfiles,$nofiles);
}
return 0;
}