From 450ba39115a502489eedb75c385a613ef4f5f467 Mon Sep 17 00:00:00 2001 From: Watson Sato Date: Mon, 17 Jun 2024 13:24:53 +0200 Subject: [PATCH] coreos_kernel_options: update entries file path In OCP 4.16 the file where kernel boot options changed. While before the file was named `ostree-1-rhcos.conf`, now it is named `ostree-1.conf`. This change is backwards compatible. --- shared/templates/coreos_kernel_option/oval.template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/templates/coreos_kernel_option/oval.template b/shared/templates/coreos_kernel_option/oval.template index 23d81c0985f..9b34e712bad 100644 --- a/shared/templates/coreos_kernel_option/oval.template +++ b/shared/templates/coreos_kernel_option/oval.template @@ -14,11 +14,11 @@ - {{{- 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) }}} - {{{- 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) }}} @@ -27,11 +27,11 @@ - {{{- 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) }}}