From e7a7110d900395d5dd330962e8f4d492b454cdae Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 15 Mar 2012 15:51:17 +0000
Subject: [PATCH] Don't try to sabotage tftp unless sure new tftp can work

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@11874 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/AAsn.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT-server/lib/xcat/plugins/AAsn.pm b/xCAT-server/lib/xcat/plugins/AAsn.pm
index 53c9fb29f..99f57c526 100644
--- a/xCAT-server/lib/xcat/plugins/AAsn.pm
+++ b/xCAT-server/lib/xcat/plugins/AAsn.pm
@@ -1359,7 +1359,7 @@ sub setup_HTTP
 sub enable_TFTPhpa
 {
   # Check whether the tftp-hpa has been installed
-  if (! -e "/etc/xinetd.d/tftp") {
+  unless (-x "/usr/sbin/in.tftpd" and -e "/etc/xinetd.d/tftp") {
     xCAT::MsgUtils->message("S", "ERROR: The tftpd was not installed, enable the tftp failed.");
     return 1;
   }