rsyslog needs to use the imjournal module to communicate with
systemd-journald instead of imuxsock. Check the system's
/etc/rsyslog.conf to see if LTP should use imjournal or imuxsock
Signed-off-by: Jeffrey Bastian <jbast...@redhat.com>
---
testcases/kernel/syscalls/syslog/syslog-lib.sh | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/testcases/kernel/syscalls/syslog/syslog-lib.sh
b/testcases/kernel/syscalls/syslog/syslog-lib.sh
index ef33517aa92b..e166d3a45261 100755
--- a/testcases/kernel/syscalls/syslog/syslog-lib.sh
+++ b/testcases/kernel/syscalls/syslog/syslog-lib.sh
@@ -71,12 +71,20 @@ setup()
CONFIG_FILE="/etc/syslog-ng/syslog-ng.conf"
elif [ "$SYSLOG_DAEMON" = "rsyslog" ]; then
CONFIG_FILE="/etc/rsyslog.conf"
- log_socket=$(grep -ho "^\$SystemLogSocketName .*" -r
/etc/rsyslog.conf /etc/rsyslog.d/ | head -1)
- RSYSLOG_CONFIG=$(cat <<EOF
+ if grep -q -r '^\$ModLoad[[:space:]]*imjournal'
/etc/rsyslog.conf /etc/rsyslog.d/ ; then
+ systemd_journal=$(grep -Ehoi
"^[^#].*(imjournal|workdirectory).*" -r /etc/rsyslog.conf /etc/rsyslog.d/)
+ RSYSLOG_CONFIG=$(cat <<EOF
+$systemd_journal
+EOF
+)
+ else
+ log_socket=$(grep -ho "^\$SystemLogSocketName .*" -r
/etc/rsyslog.conf /etc/rsyslog.d/ | head -1)
+ RSYSLOG_CONFIG=$(cat <<EOF
\$ModLoad imuxsock.so
$log_socket
EOF
)
+ fi
else
tst_resm TBROK "Couldn't find syslogd, syslog-ng or rsyslogd"
cleanup 1
--
1.9.4
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
