From bc88602e41c02d03229dc4ca571465bc87a70c47 Mon Sep 17 00:00:00 2001 From: ferorge <38674077+ferorge@users.noreply.github.com> Date: Tue, 23 Jul 2024 19:19:55 -0300 Subject: [PATCH 1/2] Fix issue #1496 Added package and service name used in ubuntu 24.04. --- include/tests_insecure_services | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/tests_insecure_services b/include/tests_insecure_services index 0a1dd955..564db774 100644 --- a/include/tests_insecure_services +++ b/include/tests_insecure_services @@ -41,7 +41,7 @@ if [ ${SKIPTEST} -eq 0 ]; then # Check for installed inetd daemon LogText "Test: Checking if inetd is installed" - if PackageIsInstalled "inetd"; then + if PackageIsInstalled "inetd" || PackageIsInstalled "inetutils-inetd"; then INETD_PACKAGE_INSTALLED=1 LogText "Result: inetd is installed" Display --indent 2 --text "- Installed inetd package" --result "${STATUS_FOUND}" --color YELLOW @@ -61,7 +61,7 @@ if [ ${SKIPTEST} -eq 0 ]; then # Check running processes LogText "Test: Searching for active inet daemon" - if IsRunning "inetd"; then + if IsRunning "inetd" || IsRunning "inetutils-inetd"; then LogText "Result: inetd is running" Display --indent 4 --text "- inetd status" --result "${STATUS_ACTIVE}" --color GREEN INETD_ACTIVE=1 From 623eaa76fe211075530e7fafd59b4ae06e7273da Mon Sep 17 00:00:00 2001 From: ferorge <38674077+ferorge@users.noreply.github.com> Date: Tue, 23 Jul 2024 19:22:07 -0300 Subject: [PATCH 2/2] Fix issue #1497 Added kernel name for Hardkernel odroid XU4. --- include/tests_ports_packages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/tests_ports_packages b/include/tests_ports_packages index 4a9fe6f3..35de8cd5 100644 --- a/include/tests_ports_packages +++ b/include/tests_ports_packages @@ -1378,7 +1378,7 @@ EOF if [ "${DPKGBINARY}" ]; then TESTED=1 - KERNEL_PKG_NAMES="linux-image-[0-9]|raspberrypi-kernel|pve-kernel-[0-9]" + KERNEL_PKG_NAMES="linux-image-[0-9]|raspberrypi-kernel|pve-kernel-[0-9]|linux-odroid-5422" KERNELS=$(${DPKGBINARY} -l 2> /dev/null | ${GREPBINARY} -E "${KERNEL_PKG_NAMES}" | ${WCBINARY} -l) if [ ${KERNELS} -eq 0 ]; then LogText "Result: found no kernels from dpkg -l output, which is unexpected"