xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-09-05 09:48:31 +00:00
Code Issues Releases Wiki Activity

Fix more rsyslogd version checks

Browse Source
This commit is contained in:
Jarrod Johnson
2017-03-11 08:52:52 -05:00
parent b53ab9ec82
commit 4b57a3a650
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xCAT-genesis-scripts/bin/doxcat
View File

@@ -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

3
xCAT-genesis-scripts/bin/restart
View File

@@ -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