xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 03:12:30 +00:00
Code Issues Releases Wiki Activity

Use postscript file efibootmgr to check http service instead of syslog (#5758)

Browse Source
This commit is contained in:
xuweibj
2018-11-16 17:33:37 +08:00
committed by Bin Xu
parent 92824aae75
commit 6d9a912cf7
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
xCAT-probe/lib/perl/probe_utils.pm
View File

@@ -298,8 +298,9 @@ sub is_http_ready {
$$errormsg_ref = "The port defined in 'site' table HTTP is not listening";
return 0;
}
my $test_file = "efibootmgr";
my $http = "http://$mnip:$httpport/$installdir/postscripts/syslog";
my $http = "http://$mnip:$httpport/$installdir/postscripts/$test_file";
my %httperror = (
"400" => "The request $http could not be understood by the server due to malformed syntax",
"401" => "The request requires user authentication.",
@@ -330,12 +331,12 @@ sub is_http_ready {
$$errormsg_ref = "Prepare test environment error: $!";
return 0;
}
my @outputtmp = `wget -O $tmpdir/syslog $http 2>&1`;
my @outputtmp = `wget -O $tmpdir/$test_file $http 2>&1`;
my $rst = $?;
$rst = $rst >> 8;
if ((!$rst) && (-e "$tmpdir/syslog")) {
unlink("$tmpdir/syslog");
if ((!$rst) && (-e "$tmpdir/$test_file")) {
unlink("$tmpdir/$test_file");
rmdir ("$tmpdir");
return 1;
} elsif ($rst == 4) {
@@ -355,7 +356,7 @@ sub is_http_ready {
$$errormsg_ref = "Unknown return code of wget <$returncode>.";
}
}
unlink("$tmpdir/syslog");
unlink("$tmpdir/$test_file");
if(! rmdir ("$tmpdir")){
$$errormsg_ref .= " Clean test environment error(rmdir $tmpdir): $!";
}