xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-14 18:30:23 +00:00
Code Issues Releases Wiki Activity

fix issue 5633, use noempty file to check tftp service (#5691)

Browse Source
This commit is contained in:
xuweibj
2018-10-11 14:50:44 +08:00
committed by Bin Xu
parent ea11ec4101
commit e18b8a0615
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -375,16 +375,18 @@ sub is_tftp_ready {
rename("/$test_dir/tftptestt.tmp", "/$test_dir/tftptestt.tmp.old") if (-e "/$test_dir/tftptestt.tmp");
rename("./tftptestt.tmp", "./tftptestt.tmp.old") if (-e "./tftptestt.tmp");
system("touch /$test_dir/tftptestt.tmp");
system("date > /$test_dir/tftptestt.tmp");
my $output = `tftp -4 -v $mnip -c get /tftptest/tftptestt.tmp 2>&1`;
if ((!$?) && (-e "./tftptestt.tmp")) {
if ((!$?) && (-s "./tftptestt.tmp")) {
unlink("./tftptestt.tmp");
rename("./tftptestt.tmp.old", "./tftptestt.tmp") if (-e "./tftptestt.tmp.old");
rename("/$test_dir/tftptestt.tmp.old", "/$test_dir/tftptestt.tmp") if (-e "/$test_dir/tftptestt.tmp.old");
system("rm -rf $test_dir");
return 1;
} else {
rename("./tftptestt.tmp.old", "./tftptestt.tmp") if (-e "./tftptestt.tmp.old");
rename("/$test_dir/tftptestt.tmp.old", "/$test_dir/tftptestt.tmp") if (-e "/$test_dir/tftptestt.tmp.old");
system("rm -rf $test_dir");
return 0;
}
}