diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2021-05-11 12:14:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-11 12:14:27 +0300 |
| commit | 2ee335503d95afeaf254d9776039e6f3c7661303 (patch) | |
| tree | ba13e0f804e7ffdb2ad008dc9844dbabbbc44105 /include | |
| parent | b941d7fccbd174e0b7feb8ad51a45a56f5973de7 (diff) | |
| parent | 0a5dfbe5e2df2984650d95db4e055719ce46bc5b (diff) | |
Merge pull request #1143 from jhe2/logg-2138-metalog
[LOGG-2138] Do not check for klogd when metalog is being used
Diffstat (limited to 'include')
| -rw-r--r-- | include/tests_logging | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/tests_logging b/include/tests_logging index 00d592b4..7b3c203b 100644 --- a/include/tests_logging +++ b/include/tests_logging @@ -177,14 +177,14 @@ # # Test : LOGG-2138 # Description : Check for kernel log daemon (klogd) presence on Linux systems - # Notes : * When using rsyslog or systemd (systemd-journal), this process is not needed. + # Notes : * When using metalog, rsyslog or systemd (systemd-journal), this process is not needed. # * In combination with syslog-ng, klogd is still an addition to it, since it # captures kernel related events and send them to syslog-ng. # * This test should be below all other logging daemons Register --test-no LOGG-2138 --os Linux --weight L --network NO --category security --description "Checking kernel logger daemon on Linux" if [ ${SKIPTEST} -eq 0 ]; then LogText "Test: Searching kernel logger daemon (klogd)" - if [ ${RSYSLOG_RUNNING} -eq 0 -a ${SYSTEMD_JOURNAL_RUNNING} -eq 0 ]; then + if [ ${RSYSLOG_RUNNING} -eq 0 ] && [ ${SYSTEMD_JOURNAL_RUNNING} -eq 0 ] && [ ${METALOG_RUNNING} -eq 0 ]; then # Search for klogd, but ignore other lines related to klogd (like dd with input/output file) #FIND=$(${PSBINARY} ax | ${GREPBINARY} "klogd" | ${GREPBINARY} -v "dd" | ${GREPBINARY} -v "grep") if IsRunning "klogd"; then |