revise other test scenarios of grub2_argument template

shared/templates/grub2_bootloader_argument/tests/arg_not_in_entries.fail.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# platform = multi_platform_fedora,multi_platform_rhel
+# packages = grub2,grubby
+
+source common.sh
+
+# Removes argument from kernel command line in /boot/loader/entries/*.conf
+
+for file in /boot/loader/entries/*.conf ; do
+  if grep -q '^.*{{{ ESCAPED_ARG_NAME }}}=.*'  "$file" ; then
+	    sed -i 's/\(^.*\){{{ARG_NAME}}}=[^[:space:]]*\(.*\)/\1 \2/'  "$file"
+  fi
+done

shared/templates/grub2_bootloader_argument/tests/arg_not_in_etcdefaultgrub_recovery_disabled.fail.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# platform = Oracle Linux 7
+# Removes the argument from kernel command line in /etc/default/grub
+if grep -q '^GRUB_CMDLINE_LINUX_DEFAULT=.*{{{ARG_NAME}}}=.*"'  '/etc/default/grub' ; then
+	sed -i 's/\(^GRUB_CMDLINE_LINUX_DEFAULT=".*\){{{ARG_NAME}}}=[^[:space:]]*\(.*"\)/\1 \2/'  '/etc/default/grub'
+fi
+
+# removing the parameter from the no recovery kernel parameters as well
+sed -i 's/\(^GRUB_CMDLINE_LINUX=".*\){{{ARG_NAME}}}=[^[:space:]]*\(.*"\)/\1 \2/'  '/etc/default/grub'
+
+# disabling recovery
+sed -i 's/\(^.*GRUB_DISABLE_RECOVERY=\).*/\1true/' '/etc/default/grub'
+
+#if the line is not present at all, add it
+if ! grep -q '^GRUB_CMDLINE_LINUX_DEFAULT=.*$' '/etc/default/grub'; then
+	echo 'GRUB_CMDLINE_LINUX_DEFAULT=""' >> /etc/default/grub
+fi

shared/templates/grub2_bootloader_argument/tests/arg_not_in_grubenv_and_not_referenced.pass.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# platform = Oracle Linux 8,Red Hat Enterprise Linux 8
+# packages = grub2,grubby
+
+{{%- if ARG_VARIABLE %}}
+# variables = {{{ ARG_VARIABLE }}}=correct_value
+{{%- set ARG_NAME_VALUE= ARG_NAME ~ "=correct_value" %}}
+{{%- endif %}}
+
+
+source common.sh
+
+# Removes audit argument from kernel command line in /boot/grub2/grubenv
+file="/boot/grub2/grubenv"
+if grep -q '^.*{{{ARG_NAME}}}=.*'  "$file" ; then
+	sed -i 's/\(^.*\){{{ARG_NAME}}}=[^[:space:]]*\(.*\)/\1 \2/'  "$file"
+fi
+
+# ensure that the grubenv entry is not referenced
+for entry in /boot/loader/entries/*.conf; do
+  if ! grep -q '\$kernelopts' "$entry"; then
+    sed -i 's/^(options.*)$/\1 \$kernelopts/' "$entry"
+  fi
+done
+
+# remediate with grubby, this ill ensure expanded options are in /boot/loader/entries/*.conf
+{{{ grub2_bootloader_argument_remediation(ARG_NAME, ARG_NAME_VALUE) }}}

shared/templates/grub2_bootloader_argument/tests/arg_not_there_grubenv.fail.sh → shared/templates/grub2_bootloader_argument/tests/arg_not_in_grubenv_but_referenced.fail.sh

@@ -11,3 +11,9 @@ if grep -q '^.*{{{ARG_NAME}}}=.*'  "$file" ; then
 	sed -i 's/\(^.*\){{{ARG_NAME}}}=[^[:space:]]*\(.*\)/\1 \2/'  "$file"
 fi
 
+for entry in /boot/loader/entries/*.conf; do
+  if ! grep -q '\$kernelopts' "$entry"; then
+    sed -i 's/^(options.*)$/\1 \$kernelopts/' "$entry"
+  fi
+done
+

shared/templates/grub2_bootloader_argument/tests/wrong_value_entries.fail.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# platform = Red Hat Enterprise Linux 9,Red Hat Enterprise Linux 10,multi_platform_fedora
+# platform = multi_platform_fedora,multi_platform_rhel
 # packages = grub2,grubby
 
 source common.sh

shared/templates/grub2_bootloader_argument/tests/wrong_value.fail.sh → shared/templates/grub2_bootloader_argument/tests/wrong_value_grubenv.fail.sh

@@ -14,3 +14,11 @@ else
 	# no arg is present, append it
 	sed -i 's/\(^.*\(vmlinuz\|kernelopts\).*\)/\1 {{{ARG_NAME}}}=wrong/'  "$file"
 fi
+
+# Ensure that grubenv is referenced through $kernelopts
+# othervise contents of grubenv are ignored
+for entry in /boot/loader/entries/*.conf; do
+  if ! grep -q '\$kernelopts' "$entry"; then
+    sed -i 's/^(options.*)$/\1 \$kernelopts/' "$entry"
+  fi
+done