From 174152ef242b1d9a18085dbe483ca2d7685548aa Mon Sep 17 00:00:00 2001 From: macie Date: Sun, 23 Mar 2025 20:32:52 +0100 Subject: [PATCH 1/2] refactor: Indent with spaces Most of the file has spaces for indentation. --- include/tests_boot_services | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/tests_boot_services b/include/tests_boot_services index 92a9f5dd..840de0b1 100644 --- a/include/tests_boot_services +++ b/include/tests_boot_services @@ -111,7 +111,7 @@ runit) SERVICE_MANAGER="runit" ;; - openrc-init) + openrc-init) SERVICE_MANAGER="openrc" ;; *) @@ -280,7 +280,7 @@ BOOT_LOADER_SEARCHED=1 CURRENT_BOOT_LOADER=$(${BOOTCTLBINARY} status --no-pager 2>/dev/null | ${AWKBINARY} '/Current Boot Loader/{ getline; print $2 }') if [ "${CURRENT_BOOT_LOADER}" = "systemd-boot" ]; then - Display --indent 2 --text "- Checking systemd-boot presence" --result "${STATUS_FOUND}" --color GREEN + Display --indent 2 --text "- Checking systemd-boot presence" --result "${STATUS_FOUND}" --color GREEN LogText "Result: found systemd-boot" BOOT_LOADER="systemd-boot" BOOT_LOADER_FOUND=1 From 3331bff9144d5fcfe5cb009e9705dccf592be607 Mon Sep 17 00:00:00 2001 From: macie Date: Sun, 23 Mar 2025 20:39:16 +0100 Subject: [PATCH 2/2] fix: Define service manager for OpenWrt OpenWrt uses `procd` as a service manager (see: ). This fixes exception "Unknown service manager" returned by BOOT-5104 test. --- include/tests_boot_services | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/tests_boot_services b/include/tests_boot_services index 840de0b1..358586f4 100644 --- a/include/tests_boot_services +++ b/include/tests_boot_services @@ -65,6 +65,7 @@ # runit - Used by Artix, Devuan, Dragora and Void # systemd - Common option with more Linux distros implementing it # upstart - Used by Debian/Ubuntu + # procd - Used by OpenWrt Register --test-no BOOT-5104 --weight L --network NO --category security --description "Determine service manager" if [ ${SKIPTEST} -eq 0 ]; then BOOT_LOADER_SEARCHED=1 @@ -114,6 +115,9 @@ openrc-init) SERVICE_MANAGER="openrc" ;; + procd) + SERVICE_MANAGER="procd" + ;; *) CONTAINS_SYSTEMD=$(echo ${SHORTNAME} | ${GREPBINARY} "systemd") if [ -n "${CONTAINS_SYSTEMD}" ]; then