2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-12 22:40:14 +00:00

Merge branch '2.9' of ssh://git.code.sf.net/p/xcat/xcat-core into 2.9

This commit is contained in:
qyin
2015-01-19 15:02:31 +08:00

View File

@@ -205,13 +205,15 @@ fi
# We only update the /etc/rsyslog.d/remote.conf file to point to the xcatmaster.
# Do not even touch rsyslog.conf
# There is no /etc/sysconfig/rsyslog file, so we use rsyslogd -v to get the version
SYSLOGPROD=`rsyslogd -v | grep rsyslogd |awk {'print $1'}`
SYSLOGVER=`rsyslogd -v | grep rsyslogd |awk {'print $2'}`
if ( pmatch $SYSLOGPROD "*rsyslogd*" ) && ( pmatch $SYSLOGVER "8*" ); then
config_rsyslog_V8
#keep a record
logger -t xCAT -p local4.info "Install: rsyslog version 8 setup"
exit 0
if [ -e "/sbin/rsyslogd" -o -e "/usr/sbin/rsyslogd" ]; then
SYSLOGPROD=`rsyslogd -v | grep rsyslogd |awk {'print $1'}`
SYSLOGVER=`rsyslogd -v | grep rsyslogd |awk {'print $2'}`
if ( pmatch $SYSLOGPROD "*rsyslogd*" ) && ( pmatch $SYSLOGVER "8*" ); then
config_rsyslog_V8
#keep a record
logger -t xCAT -p local4.info "Install: rsyslog version 8 setup"
exit 0
fi
fi
if [ "$(uname -s)" = "Linux" ]; then