From 57f6ddd38b113ecd739a24ecb0cf7ba23ad5a86b Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 26 Feb 2018 10:36:06 -0500 Subject: [PATCH] Actually change confluent detection in replaycons --- xCAT-server/bin/replaycons | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/xCAT-server/bin/replaycons b/xCAT-server/bin/replaycons index 99ad0158f..bec0e4057 100755 --- a/xCAT-server/bin/replaycons +++ b/xCAT-server/bin/replaycons @@ -72,15 +72,13 @@ if ($hmtab) { my $file = "/var/log/consoles/$node"; #use confluent if it is there -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 +my $stab = xCAT::Table->new('site'); +if ($stab) { + (my $ref) = $stab->getAttribs({key => 'consoleservice'}, 'value'); + if ($ref->{value} && $ref->{value} eq 'confluent') { $file = "/var/log/confluent/consoles/$node"; - fi -fi + } +} #print "file=$file\n";