mirror of
https://github.com/CISOfy/lynis.git
synced 2025-07-27 15:54:09 +02:00
Improve systemd detection
This commit is contained in:
parent
c0a6aaf855
commit
00648a636c
@ -239,7 +239,7 @@
|
||||
ssh-keyscan) SSHKEYSCANFOUND=1; SSHKEYSCANBINARY="${BINARY}"; LogText " Found known binary: ssh-keyscan (scanner for SSH keys) - ${BINARY}" ;;
|
||||
sysctl) SYSCTLFOUND=1; SYSCTLBINARY="${BINARY}"; LogText " Found known binary: sysctl (kernel parameters) - ${BINARY}" ;;
|
||||
syslog-ng) SYSLOGNGFOUND=1; SYSLOGNGBINARY="${BINARY}"; SYSLOGNGVERSION=$(${BINARY} -V 2>&1 | grep "^syslog-ng" | awk '{ print $2 }'); LogText "Found ${BINARY} (version ${SYSLOGNGVERSION})" ;;
|
||||
systemctl) SYSTEMCTLFOUND=1; SYSTEMCTLBINARY="${BINARY}"; SERVICE_MANAGER="systemd"; LogText " Found known binary: systemctl (client to systemd) - ${BINARY}" ;;
|
||||
systemctl) SYSTEMCTLFOUND=1; SYSTEMCTLBINARY="${BINARY}"; SERVICE_MANAGER="systemd"; HAS_SYSTEMD=1; LogText " Found known binary: systemctl (client to systemd) - ${BINARY}" ;;
|
||||
timedatectl) TIMEDATECTLFOUND=1; TIMEDATECTL="${BINARY}"; LogText " Found known binary: timedatectl (timedate client) - ${BINARY}" ;;
|
||||
tr) TRFOUND=1; TRBINARY="${BINARY}"; LogText " Found known binary: tr (text transformation) - ${BINARY}" ;;
|
||||
tripwire) TRIPWIREFOUND=1; TRIPWIREBINARY="${BINARY}"; LogText " Found known binary: tripwire (file integrity) - ${BINARY}" ;;
|
||||
|
15
lynis
15
lynis
@ -783,13 +783,22 @@ ${NORMAL}
|
||||
#
|
||||
#################################################################################
|
||||
#
|
||||
# Check for systemd presence
|
||||
if [ -d ${ROOTDIR}lib/systemd/system -a -f ${ROOTDIR}usr/lib/systemd/systemd ]; then
|
||||
# Check for systemd presence (already tested via binaries: systemctl)
|
||||
if [ ${HAS_SYSTEMD} -eq 0 ]; then
|
||||
FOUND=0
|
||||
# Backup option to do additional testing for systemd
|
||||
LIST="${ROOTDIR}lib/systemd/system"; for ITEM in ${LIST}; do if [ -d ${ITEM} ]; then FOUND=1; break; fi; done
|
||||
LIST="${ROOTDIR}usr/lib/systemd/systemd"
|
||||
if [ ${FOUND} -eq 0 ]; then for ITEM in ${LIST}; do if [ -f ${ITEM} ]; then FOUND=1; break; fi; done; fi
|
||||
else
|
||||
FOUND=1
|
||||
fi
|
||||
if [ ${FOUND} -eq 1 ]; then
|
||||
LogText "Result: systemd is using systemd"
|
||||
HAS_SYSTEMD=1
|
||||
Report "systemd=1"
|
||||
else
|
||||
LogText "Result: systemd not found, or partially"
|
||||
LogText "Result: systemd not found"
|
||||
Report "systemd=0"
|
||||
fi
|
||||
#
|
||||
|
Loading…
x
Reference in New Issue
Block a user