From 06e3d98c913dbdffce19f65546123a4eb7629be6 Mon Sep 17 00:00:00 2001
From: teoberi <netadmin@aicta.ro>
Date: Sun, 3 Jan 2021 12:14:24 +0200
Subject: Update tests_boot_services

Add test for ELILO boot loader
---
 include/tests_boot_services | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'include/tests_boot_services')

diff --git a/include/tests_boot_services b/include/tests_boot_services
index 7d6feeec..cb9f5586 100644
--- a/include/tests_boot_services
+++ b/include/tests_boot_services
@@ -483,6 +483,25 @@
     fi
 #
 #################################################################################
+#
+    # Test        : BOOT-5140
+    # Description : Check for ELILO boot loader
+    Register --test-no BOOT-5140 --os "Linux" --weight L --network NO --root-only YES --category security --description "Check for ELILO boot loader presence"
+    if [ ${SKIPTEST} -eq 0 ]; then
+        BOOT_LOADER_SEARCHED=1
+        CONF_FILES="${ROOTDIR}etc/elilo.conf ${ROOTDIR}boot/efi/EFI/Slackware/elilo.conf"
+        for FILE in ${CONF_FILES}; do
+            FileExists ${FILE}
+            if [ ${FILE_FOUND} -eq 1 ]; then
+                Display --indent 2 --text "- Checking boot loader ELILO" --result "${STATUS_FOUND}" --color GREEN
+                LogText "Result: found ELILO boot loader"
+                BOOT_LOADER="ELILO"
+                BOOT_LOADER_FOUND=1
+            fi
+        done
+    fi
+#
+#################################################################################
 #
     # Test        : BOOT-5142
     # Description : Check for SILO boot loader
-- 
cgit v1.2.3


From 403a5b5651c27ed646cdb0d9a2c95e7188af2184 Mon Sep 17 00:00:00 2001
From: teoberi <netadmin@aicta.ro>
Date: Sat, 9 Jan 2021 17:58:02 +0200
Subject: Update tests_boot_services

Modify CONF_FILES variable
---
 include/tests_boot_services | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/tests_boot_services')

diff --git a/include/tests_boot_services b/include/tests_boot_services
index cb9f5586..c3a36307 100644
--- a/include/tests_boot_services
+++ b/include/tests_boot_services
@@ -489,7 +489,7 @@
     Register --test-no BOOT-5140 --os "Linux" --weight L --network NO --root-only YES --category security --description "Check for ELILO boot loader presence"
     if [ ${SKIPTEST} -eq 0 ]; then
         BOOT_LOADER_SEARCHED=1
-        CONF_FILES="${ROOTDIR}etc/elilo.conf ${ROOTDIR}boot/efi/EFI/Slackware/elilo.conf"
+        CONF_FILES="${ROOTDIR}etc/elilo.conf ${ROOTDIR}boot/efi/EFI/${LINUX_VERSION}/elilo.conf"
         for FILE in ${CONF_FILES}; do
             FileExists ${FILE}
             if [ ${FILE_FOUND} -eq 1 ]; then
-- 
cgit v1.2.3