From f5b1396a2d33424917778f4d04d3ea286bb97901 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 24 Sep 2024 09:16:08 +0200 Subject: [PATCH] example: fix grub2 fragment after images#943 and images#937 This commit fixes the grub2 fragments that require changing after: https://github.com/osbuild/images/pull/943 https://github.com/osbuild/images/pull/937 We now create predictable versions/release for fake kernels and also include the architecture. --- example/centos/fragment/grub2/aarch64.yaml | 2 +- example/centos/fragment/grub2/x86_64.yaml | 2 +- .../centos/9/x86_64/ami/centos_9-x86_64-ami-empty.yaml | 2 +- .../centos/9/x86_64/qcow2/centos_9-x86_64-qcow2-empty.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/example/centos/fragment/grub2/aarch64.yaml b/example/centos/fragment/grub2/aarch64.yaml index 04b125e8..51294770 100644 --- a/example/centos/fragment/grub2/aarch64.yaml +++ b/example/centos/fragment/grub2/aarch64.yaml @@ -6,7 +6,7 @@ options: uefi: vendor: centos unified: true - saved_entry: ffffffffffffffffffffffffffffffff-0-0.noarch + saved_entry: ffffffffffffffffffffffffffffffff-8-2.fk1.aarch64 write_cmdline: false config: default: saved diff --git a/example/centos/fragment/grub2/x86_64.yaml b/example/centos/fragment/grub2/x86_64.yaml index 7b7523d7..8e97bbc2 100644 --- a/example/centos/fragment/grub2/x86_64.yaml +++ b/example/centos/fragment/grub2/x86_64.yaml @@ -7,7 +7,7 @@ options: uefi: vendor: centos unified: true - saved_entry: ffffffffffffffffffffffffffffffff-0-0.noarch + saved_entry: ffffffffffffffffffffffffffffffff-8-2.fk1.x86_64 write_cmdline: false config: default: saved diff --git a/test/data/images-ref/centos/9/x86_64/ami/centos_9-x86_64-ami-empty.yaml b/test/data/images-ref/centos/9/x86_64/ami/centos_9-x86_64-ami-empty.yaml index 9344ce1c..7fc49140 100644 --- a/test/data/images-ref/centos/9/x86_64/ami/centos_9-x86_64-ami-empty.yaml +++ b/test/data/images-ref/centos/9/x86_64/ami/centos_9-x86_64-ami-empty.yaml @@ -343,7 +343,7 @@ pipelines: uefi: vendor: centos unified: true - saved_entry: ffffffffffffffffffffffffffffffff-0-0.noarch + saved_entry: ffffffffffffffffffffffffffffffff-8-2.fk1.x86_64 write_cmdline: false config: default: saved diff --git a/test/data/images-ref/centos/9/x86_64/qcow2/centos_9-x86_64-qcow2-empty.yaml b/test/data/images-ref/centos/9/x86_64/qcow2/centos_9-x86_64-qcow2-empty.yaml index 76641c2e..b067dd17 100644 --- a/test/data/images-ref/centos/9/x86_64/qcow2/centos_9-x86_64-qcow2-empty.yaml +++ b/test/data/images-ref/centos/9/x86_64/qcow2/centos_9-x86_64-qcow2-empty.yaml @@ -271,7 +271,7 @@ pipelines: uefi: vendor: centos unified: true - saved_entry: ffffffffffffffffffffffffffffffff-0-0.noarch + saved_entry: ffffffffffffffffffffffffffffffff-8-2.fk1.x86_64 write_cmdline: false config: default: saved