From 4b57a3a65087bc5a3983c122e85f3f8d8ae85fba Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Sat, 11 Mar 2017 08:52:52 -0500
Subject: [PATCH] Fix more rsyslogd version checks

---
 xCAT-genesis-scripts/bin/doxcat  | 4 ++--
 xCAT-genesis-scripts/bin/restart | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/xCAT-genesis-scripts/bin/doxcat b/xCAT-genesis-scripts/bin/doxcat
index edcd5e9ad..d8863b373 100755
--- a/xCAT-genesis-scripts/bin/doxcat
+++ b/xCAT-genesis-scripts/bin/doxcat
@@ -17,9 +17,9 @@ if [ -f /var/run/syslogd.pid ]; then
     kill -TERM `cat /var/run/syslogd.pid`
 fi 
 
-if [ $RSYSLOGD_VERSION -ge 8 ]; then
+if [ $RSYSLOGD_VERSION -ge 7 ]; then
     /sbin/rsyslogd
-    # Newer vers of rsyslogd (8 and higher) do not support -c flag anymore
+    # Newer vers of rsyslogd (7 and higher) do not support -c flag anymore
 else
     /sbin/rsyslogd -c4
 fi
diff --git a/xCAT-genesis-scripts/bin/restart b/xCAT-genesis-scripts/bin/restart
index a51157e4a..a19b862dc 100755
--- a/xCAT-genesis-scripts/bin/restart
+++ b/xCAT-genesis-scripts/bin/restart
@@ -1,4 +1,5 @@
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
+# Lenovo (c) 2017
 #Redhcp, do the xcat part again
 FORCENICS=`cat /restart|awk '{print $2}'`
 rm /restart
@@ -47,7 +48,7 @@ while [ $WAITING -gt 0 ]; do
     kill -9 `cat /var/run/syslogd.pid`
     sleep 3
     RSYSLOGD_VERSION=`rsyslogd -v | grep "rsyslogd" | cut -d" " -f2 | cut -d"." -f1`
-    if [ $RSYSLOGD_VERSION -ge 8 ]; then
+    if [ $RSYSLOGD_VERSION -ge 7 ]; then
         # Newer versions of rsyslogd do not support -c flag anymore
         /sbin/rsyslogd
     else