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

-fix bug#2493580, <pattern>64-bit</pattern> and stunnel package are not available for SLES11

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2591 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
mxi1 2009-01-12 04:44:56 +00:00
parent 51a1219b42
commit 31e2aad089
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
perl-xCAT/xCAT/Client.pm
View File

@ -230,7 +230,7 @@ sub plugin_command {
@nodes = xCAT::NodeRange::noderange($req->{noderange}->[0]);
if (xCAT::NodeRange::nodesmissed()) {
# my $rsp = {errorcode=>1,error=>"Invalid nodes in noderange:".join(',',xCAT::NodeRange::nodesmissed)};
#my $rsp->{serverdone} = {};#minjun
#my $rsp->{serverdone} = {};
print "Invalid nodes in noderangex:".join(',',xCAT::NodeRange::nodesmissed())."\n";
# if ($sock) {
# print $sock XMLout($rsp,RootName=>'xcatresponse' ,NoAttr=>1);

21
xCAT-server/lib/xcat/plugins/sles.pm
View File

@ -301,6 +301,27 @@ sub mkinstall
"/install/autoinst/$node",
$node
);
#sles11 cannot find <pattern>base-64bit</pattern> and
#<package>stunnel</package> in the autoyast file
if($os eq 'sles11') {
my $SLES_YAST_FILE;
open SLES_YAST_FILE, "/install/autoinst/$node"||\
return "Cannot open autoyast file for SLES11\n";
my $yast_content="";
while(<SLES_YAST_FILE>) {
if($_ !~ m/<pattern>base-64bit<\/pattern>|
<package>stunnel<\/package>/) {
$yast_content .=$_;
}
}
close SLES_YAST_FILE;
#create one new autoyast file
system("rm /install/autoinst/$node");
open SLES_YAST_FILE, ">/install/autoinst/$node" || \
return "cannot open autoyast file for SLES11\n";
print SLES_YAST_FILE $yast_content;
close SLES_YAST_FILE;
}
}
if ($tmperr)