From d6887493679096fb9533344ac481055b0caf9f6f Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Fri, 23 Feb 2018 11:52:12 -0500
Subject: [PATCH] Actually check the site table value

It may be the case someone tried and discontinued use of
confluent.  Check the current site table value to confirm
the choice.
---
 xCAT-server/bin/replaycons | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/xCAT-server/bin/replaycons b/xCAT-server/bin/replaycons
index bfa7fa5a4..99ad0158f 100755
--- a/xCAT-server/bin/replaycons
+++ b/xCAT-server/bin/replaycons
@@ -72,9 +72,15 @@ if ($hmtab) {
 my $file = "/var/log/consoles/$node";
 
 #use confluent if it is there
-if (((-x "/opt/confluent/bin/confetty") || (-x "/usr/bin/confetty")) && -f "/var/log/confluent/consoles/$node") {
-    $file = "/var/log/confluent/consoles/$node";
-}
+USE_CONFLUENT=0
+CONSOLE_SERVICE_KEYWORD=`tabdump site | grep consoleservice | cut -d, -f1 | tr -d '"'`
+CONSOLE_SERVICE_VALUE=`tabdump site | grep consoleservice | cut -d, -f2 | tr -d '"'`
+
+if [ "$CONSOLE_SERVICE_KEYWORD" == "consoleservice" ]; then
+    if [ "$CONSOLE_SERVICE_VALUE" == "confluent" ]; then
+        $file = "/var/log/confluent/consoles/$node";
+    fi
+fi
 
 #print "file=$file\n";