diff options
| -rw-r--r-- | include/binaries | 4 | ||||
| -rw-r--r-- | include/functions | 5 | ||||
| -rw-r--r-- | include/osdetection | 6 |
3 files changed, 11 insertions, 4 deletions
diff --git a/include/binaries b/include/binaries index a07d34ad..4ab0afb3 100644 --- a/include/binaries +++ b/include/binaries @@ -119,11 +119,11 @@ COUNT=$((COUNT + 1)) BINARY="${SCANDIR}/${FILENAME}" DISCOVERED_BINARIES="${DISCOVERED_BINARIES}${BINARY} " - if [ -u ${BINARY} ]; then + if [ -u "${BINARY}" ]; then NSUID_BINARIES=$((NSUID_BINARIES + 1)) SUID_BINARIES="${SUID_BINARIES}${BINARY} " fi - if [ -g ${BINARY} ]; then + if [ -g "${BINARY}" ]; then NSGID_BINARIES=$((NSGID_BINARIES + 1)) SGID_BINARIES="${SGID_BINARIES}${BINARY} " fi diff --git a/include/functions b/include/functions index b72e7156..c88674ba 100644 --- a/include/functions +++ b/include/functions @@ -1089,12 +1089,13 @@ ;; "Solaris") - INTERFACES_TO_TEST="e1000g1 net0" + INTERFACES_TO_TEST="net0 e1000g1 e1000g0" FOUND=0 for I in ${INTERFACES_TO_TEST}; do FIND=$(${IFCONFIGBINARY} -a | grep "^${I}") if [ ! "${FIND}" = "" ]; then FOUND=1; LogText "Found interface ${I} on Solaris" + break fi done if [ ${FOUND} -eq 1 ]; then @@ -1107,7 +1108,7 @@ ReportException "GetHostID" "Can not find sha1/sha1sum or openssl" fi else - ReportException "GetHostID" "No interface found op Solaris to create HostID" + ReportException "GetHostID" "No interface found on Solaris to create HostID" fi ;; diff --git a/include/osdetection b/include/osdetection index 4b5c68e1..36dc47a3 100644 --- a/include/osdetection +++ b/include/osdetection @@ -190,6 +190,12 @@ OS_VERSION=$(grep "^VERSION_ID=" /etc/os-release | awk -F= '{print $2}' | tr -d '"') OS_VERSION_FULL=$(grep "^VERSION=" /etc/os-release | awk -F= '{print $2}' | tr -d '"') ;; + "endeavouros") + LINUX_VERSION="EndeavourOS" + OS_NAME="EndeavourOS" + OS_VERSION="Rolling release" + OS_VERSION_FULL="Rolling release" + ;; "fedora") LINUX_VERSION="Fedora" OS_NAME="Fedora Linux" |