Rename of categories, introduction of groups

1 files changed, 19 insertions, 19 deletions

diff --git a/include/tests_boot_services b/include/tests_boot_services
index 08868155..b55536bb 100644
--- a/include/tests_boot_services
+++ b/include/tests_boot_services
@@ -37,7 +37,7 @@
     # Test        : BOOT-5102
     # Description : Check for AIX boot device
     # Notes       : The AIX bootstrap is called as software ROS. Bootstrap contains IPL (Initial Program loader)
-    Register --test-no BOOT-5102 --os AIX --weight L --network NO --root-only YES --description "Check for AIX boot device"
+    Register --test-no BOOT-5102 --os AIX --weight L --network NO --root-only YES --category security --description "Check for AIX boot device"
     if [ ${SKIPTEST} -eq 0 ]; then
         BOOT_LOADER_SEARCHED=1
         LogText "Test: Query bootinfo for AIX boot device"
@@ -64,7 +64,7 @@
     # initscripts     - Used by Arch before
     # systemd         - Common option with more Linux distros implementing it
     # upstart         - Used by Debian/Ubuntu
-    Register --test-no BOOT-5104 --weight L --network NO --description "Determine service manager"
+    Register --test-no BOOT-5104 --weight L --network NO --category security --description "Determine service manager"
     if [ ${SKIPTEST} -eq 0 ]; then
         BOOT_LOADER_SEARCHED=1
         case ${OS} in
@@ -136,7 +136,7 @@
 #
     # Test        : BOOT-5106
     # Description : Check if boot.efi is found on Mac OS X
-    Register --test-no BOOT-5106 --os "MacOS" --weight L --network NO --root-only YES --description "Check EFI boot file on Mac OS X"
+    Register --test-no BOOT-5106 --os "MacOS" --weight L --network NO --root-only YES --category security --description "Check EFI boot file on Mac OS X"
     if [ ${SKIPTEST} -eq 0 ]; then
         FileExists /System/Library/CoreServices/boot.efi
         if [ ${FILE_FOUND} -eq 1 ]; then
@@ -150,7 +150,7 @@
 #
     # Test        : BOOT-5116
     # Description : Check if system is booted in UEFI mode
-    Register --test-no BOOT-5116 --weight L --network NO --root-only YES --description "Check if system is booted in UEFI mode"
+    Register --test-no BOOT-5116 --weight L --network NO --root-only YES --category security --description "Check if system is booted in UEFI mode"
     if [ ${SKIPTEST} -eq 0 ]; then
         UEFI_TESTS_PERFORMED=0
         case ${OS} in
@@ -210,7 +210,7 @@
 #
     # Test        : BOOT-5121
     # Description : Check for GRUB boot loader
-    Register --test-no BOOT-5121 --weight L --network NO --description "Check for GRUB boot loader presence"
+    Register --test-no BOOT-5121 --weight L --network NO --category security --description "Check for GRUB boot loader presence"
     if [ ${SKIPTEST} -eq 0 ]; then
         BOOT_LOADER_SEARCHED=1
         FOUND=0
@@ -259,7 +259,7 @@
     # Test        : BOOT-5122
     # Description : Check for GRUB boot loader configuration
     if [ ! "${GRUBCONFFILE}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
-    Register --test-no BOOT-5122 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check for GRUB boot password"
+    Register --test-no BOOT-5122 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check for GRUB boot password"
     if [ ${SKIPTEST} -eq 0 ]; then
         FOUND=0
         LogText "Found file ${GRUBCONFFILE}, proceeding with tests."
@@ -296,7 +296,7 @@
 #
     # Test        : BOOT-5124
     # Description : Check for FreeBSD boot loader
-    Register --test-no BOOT-5124 --os FreeBSD --weight L --network NO --description "Check for FreeBSD boot loader presence"
+    Register --test-no BOOT-5124 --os FreeBSD --weight L --network NO --category security --description "Check for FreeBSD boot loader presence"
     if [ ${SKIPTEST} -eq 0 ]; then
         BOOT_LOADER_SEARCHED=1
         if [ -f /boot/boot1 -a -f /boot/boot2 -a -f /boot/loader ]; then
@@ -313,7 +313,7 @@
 #
     # Test        : BOOT-5126
     # Description : Check for NetBSD boot loader
-    Register --test-no BOOT-5126 --os NetBSD --weight L --network NO --description "Check for NetBSD boot loader presence"
+    Register --test-no BOOT-5126 --os NetBSD --weight L --network NO --category security --description "Check for NetBSD boot loader presence"
     if [ ${SKIPTEST} -eq 0 ]; then
         BOOT_LOADER_SEARCHED=1
         if [ -f /boot.${HARDWARE} -o -f /boot -o -f /ofwboot ]; then
@@ -332,7 +332,7 @@
     # Test        : BOOT-5139
     # Description : Check for LILO boot loader
     # Notes       : password= or password =
-    Register --test-no BOOT-5139 --weight L --network NO --description "Check for LILO boot loader presence"
+    Register --test-no BOOT-5139 --weight L --network NO --category security --description "Check for LILO boot loader presence"
     if [ ${SKIPTEST} -eq 0 ]; then
         BOOT_LOADER_SEARCHED=1
         LILOCONFFILE="/etc/lilo.conf"
@@ -369,7 +369,7 @@
 #
     # Test        : BOOT-5142
     # Description : Check for SILO boot loader
-    Register --test-no BOOT-5142 --weight L --network NO --description "Check SPARC Improved boot loader (SILO)"
+    Register --test-no BOOT-5142 --weight L --network NO --category security --description "Check SPARC Improved boot loader (SILO)"
     if [ ${SKIPTEST} -eq 0 ]; then
         BOOT_LOADER_SEARCHED=1
         if [ -f /etc/silo.conf ]; then
@@ -387,7 +387,7 @@
     # Test        : BOOT-5144
     # Description : Check for SILO boot loader consistency
     # Notes       : To be tested on Gentoo
-#    Register --test-no BOOT-5144 --weight L --network NO --description "Check SPARC Improved boot loader (SILO)"
+#    Register --test-no BOOT-5144 --weight L --network NO --category security --description "Check SPARC Improved boot loader (SILO)"
 #    if [ ${SKIPTEST} -eq 0 ]; then
 #        if [ -f /etc/silo.conf -a -x /sbin/silo ]; then
 #            FIND=`/sbin/silo | grep "appears to be valid"`
@@ -406,7 +406,7 @@
 #
     # Test        : BOOT-5155
     # Description : Check for YABOOT boot loader
-    Register --test-no BOOT-5155 --weight L --network NO --description "Check for YABOOT boot loader configuration file"
+    Register --test-no BOOT-5155 --weight L --network NO --category security --description "Check for YABOOT boot loader configuration file"
     if [ ${SKIPTEST} -eq 0 ]; then
         BOOT_LOADER_SEARCHED=1
         LogText "Test: Check for /etc/yaboot.conf"
@@ -425,7 +425,7 @@
     # Test        : BOOT-5159
     # Description : Check for OpenBSD boot loader
     # More info   : Only OpenBSD
-    Register --test-no BOOT-5159 --os OpenBSD --weight L --network NO --description "Check for OpenBSD boot loader presence"
+    Register --test-no BOOT-5159 --os OpenBSD --weight L --network NO --category security --description "Check for OpenBSD boot loader presence"
     if [ ${SKIPTEST} -eq 0 ]; then
         BOOT_LOADER_SEARCHED=1
         FOUND=0
@@ -475,7 +475,7 @@
 #
     # Test        : BOOT-5165
     # Description : Check for FreeBSD boot services
-    Register --test-no BOOT-5165 --os FreeBSD --weight L --network NO --description "Check for FreeBSD boot services"
+    Register --test-no BOOT-5165 --os FreeBSD --weight L --network NO --category security --description "Check for FreeBSD boot services"
     if [ ${SKIPTEST} -eq 0 ]; then
         if [ ! "${SERVICEBINARY}" = "" ]; then
             # FreeBSD (Ask services(8) for enabled services)
@@ -502,7 +502,7 @@
     # Test        : BOOT-5177
     # Description : Check for Linux boot services (systemd and chkconfig)
     # Notes       : We skip using chkconfig if systemd is being used.
-    Register --test-no BOOT-5177 --os Linux --weight L --network NO --description "Check for Linux boot and running services"
+    Register --test-no BOOT-5177 --os Linux --weight L --network NO --category security --description "Check for Linux boot and running services"
     if [ ${SKIPTEST} -eq 0 ]; then
         CHECKED=0
         LogText "Test: checking presence systemctl binary"
@@ -568,7 +568,7 @@
     # Description : Check for Linux boot services (Debian style)
     # Notes       : Debian 8+ shows runlevel 5
     if [ "${LINUX_VERSION}" = "Debian" -o "${LINUX_VERSION}" = "Ubuntu" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
-    Register --test-no BOOT-5180 --os Linux --preqs-met ${PREQS_MET} --weight L --network NO --description "Check for Linux boot services (Debian style)"
+    Register --test-no BOOT-5180 --os Linux --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check for Linux boot services (Debian style)"
     if [ ${SKIPTEST} -eq 0 ]; then
         # Runlevel check
         sRUNLEVEL=`${RUNLEVELBINARY} | grep "N [0-9]" | awk '{ print $2} '`
@@ -597,7 +597,7 @@
 #
     # Test        : BOOT-5184
     # Description : Check world writable startup scripts
-    Register --test-no BOOT-5184 --os Linux --weight L --network NO --description "Check permissions for boot files/scripts"
+    Register --test-no BOOT-5184 --os Linux --weight L --network NO --category security --description "Check permissions for boot files/scripts"
     if [ ${SKIPTEST} -eq 0 ]; then
         FOUND=0
         CHECKDIRS="/etc/init.d /etc/rc.d /etc/rcS.d"
@@ -682,7 +682,7 @@
 #
     # Test        : BOOT-5202
     # Description : Check uptime of system
-    Register --test-no BOOT-5202 --weight L --network NO --description "Check uptime of system"
+    Register --test-no BOOT-5202 --weight L --network NO --category security --description "Check uptime of system"
     if [ ${SKIPTEST} -eq 0 ]; then
         FOUND=0
         FIND=""
@@ -755,7 +755,7 @@
 #
     # Test        : BOOT-5260
     # Description : Check single user mode for systemd
-    Register --test-no BOOT-5260 --weight L --network NO --description "Check single user mode for systemd"
+    Register --test-no BOOT-5260 --weight L --network NO --category security --description "Check single user mode for systemd"
     if [ ${SKIPTEST} -eq 0 ]; then
         # Check if file exists
         LogText "Test: Searching /usr/lib/systemd/system/rescue.service"