From e18b8a06158dbe4ed5bd114b6a89601ee4487f8d Mon Sep 17 00:00:00 2001
From: xuweibj <xwbj@cn.ibm.com>
Date: Thu, 11 Oct 2018 14:50:44 +0800
Subject: [PATCH] fix issue 5633, use noempty file to check tftp service
 (#5691)

---
 xCAT-probe/lib/perl/probe_utils.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/xCAT-probe/lib/perl/probe_utils.pm b/xCAT-probe/lib/perl/probe_utils.pm
index e68c005e5..a539ce4bc 100644
--- a/xCAT-probe/lib/perl/probe_utils.pm
+++ b/xCAT-probe/lib/perl/probe_utils.pm
@@ -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;
     }
 }