Merge pull request #12069 from yuumasato/update_coreos_kernel_options…

…_template OCPBUGS-31674: coreos_kernel_options -update entries file path
ComplianceAsCode · Jun 21, 2024 · 6147cc6 · 6147cc6
2 parents c779035 + 450ba39
commit 6147cc6
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/shared/templates/coreos_kernel_option/oval.template b/shared/templates/coreos_kernel_option/oval.template
@@ -14,11 +14,11 @@
     <criteria operator="AND">
       <criteria operator="OR">
         <criteria operator="AND">
-            {{{- oval_file_absent_criterion('/boot/loader/entries/ostree-2-.*.conf')}}}
-            {{{- oval_argument_value_in_line_criterion('/boot/loader/entries/ostree-1-.*.conf', ARG_NAME, ARG_VALUE, 'Linux kernel', negate=ARG_NEGATE) }}}
+            {{{- oval_file_absent_criterion('/boot/loader/entries/ostree-2.*.conf')}}}
+            {{{- oval_argument_value_in_line_criterion('/boot/loader/entries/ostree-1.*.conf', ARG_NAME, ARG_VALUE, 'Linux kernel', negate=ARG_NEGATE) }}}
         </criteria>
         <criteria operator="AND">
-            {{{- oval_argument_value_in_line_criterion('/boot/loader/entries/ostree-2-.*.conf', ARG_NAME, ARG_VALUE, 'Linux kernel', negate=ARG_NEGATE) }}}
+            {{{- oval_argument_value_in_line_criterion('/boot/loader/entries/ostree-2.*.conf', ARG_NAME, ARG_VALUE, 'Linux kernel', negate=ARG_NEGATE) }}}
         </criteria>
       </criteria>
       <criteria operator="AND">
@@ -27,11 +27,11 @@
     </criteria>
   </definition>
 
-  {{{- oval_file_absent('/boot/loader/entries/ostree-2-.*.conf') }}}
+  {{{- oval_file_absent('/boot/loader/entries/ostree-2.*.conf') }}}
   {{{-
-  oval_argument_value_in_line_test('/boot/loader/entries/ostree-1-.*.conf', ARG_NAME, ARG_VALUE, 'options ', is_regex=ARG_IS_REGEX) }}}
+  oval_argument_value_in_line_test('/boot/loader/entries/ostree-1.*.conf', ARG_NAME, ARG_VALUE, 'options ', is_regex=ARG_IS_REGEX) }}}
 
-  {{{- oval_argument_value_in_line_test('/boot/loader/entries/ostree-2-.*.conf', ARG_NAME, ARG_VALUE, 'options ', is_regex=ARG_IS_REGEX) }}}
+  {{{- oval_argument_value_in_line_test('/boot/loader/entries/ostree-2.*.conf', ARG_NAME, ARG_VALUE, 'options ', is_regex=ARG_IS_REGEX) }}}
 
   {{{- oval_argument_value_in_line_test('/proc/cmdline', ARG_NAME, ARG_VALUE, 'BOOT_IMAGE', is_regex=ARG_IS_REGEX) }}}
 </def-group>