mirror of https://github.com/CISOfy/lynis.git
refactor: Specify linux HOSTNAME detection
This is the first step to fix error on OpenWrt without changing current behavior.
This commit is contained in:
parent
4f7a333a35
commit
f907c320a2
25
lynis
25
lynis
|
@ -514,22 +514,27 @@ ${NORMAL}
|
|||
. ${INCLUDEDIR}/osdetection
|
||||
Display --indent 2 --text "- Detecting OS... " --result "${STATUS_DONE}" --color GREEN
|
||||
|
||||
# Check hostname and get timestamp
|
||||
# Detect hostname and domain
|
||||
FQDN=$(hostname 2> /dev/null)
|
||||
case ${OS} in
|
||||
HP-UX)
|
||||
HOSTNAME=$(hostname) ;;
|
||||
HOSTNAME=$(hostname) ;;
|
||||
Linux)
|
||||
HOSTNAME=$(hostname -s 2> /dev/null)
|
||||
if [ -z "${HOSTNAME}" ]; then
|
||||
HOSTNAME="${FQDN:-no-hostname}"
|
||||
fi
|
||||
if [ "${HOSTNAME}" = "${FQDN}" ]; then
|
||||
FQDN=$(hostname -f 2> /dev/null)
|
||||
fi
|
||||
;;
|
||||
Solaris)
|
||||
HOSTNAME=$(uname -n) ;;
|
||||
HOSTNAME=$(uname -n) ;;
|
||||
*)
|
||||
HOSTNAME=$(hostname -s 2> /dev/null) ;;
|
||||
HOSTNAME=$(hostname -s 2> /dev/null) ;;
|
||||
esac
|
||||
if [ -z "${HOSTNAME}" ]; then
|
||||
HOSTNAME=$(hostname 2> /dev/null)
|
||||
if [ -z "${HOSTNAME}" ]; then HOSTNAME="no-hostname"; fi
|
||||
fi
|
||||
FQDN=$(hostname 2> /dev/null)
|
||||
if [ "${OS}" = "Linux" -a "${HOSTNAME}" = "${FQDN}" ]; then
|
||||
FQDN=$(hostname -f 2> /dev/null)
|
||||
HOSTNAME="${FQDN:-no-hostname}"
|
||||
fi
|
||||
#
|
||||
#################################################################################
|
||||
|
|
Loading…
Reference in New Issue