From 72bd4b00e4739a5500b5ebcccd6e7208313c8b7a Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Tue, 20 Feb 2024 15:09:23 -0500 Subject: [PATCH] tests/env-godebug: simplify initramfs finding Just get at the initramfs using a glob instead of trying to parse the BLS. This will work regardless of how the BLS entry is named but assumes that there is only one BLS entry (which should always be the case for these tests). (cherry picked from commit 1841132d3cadf406a694b722df6e3d0fb9bfb456) --- We're backporting this because a recent rebuild of 4.15 cosa pulled in a new ostree which enables `bootloader-naming-2` by default, which changes the BLS entry name: https://github.com/ostreedev/ostree/pull/3206 --- tests/kola/files/env-godebug | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/kola/files/env-godebug b/tests/kola/files/env-godebug index 8f902b0b..60733720 100755 --- a/tests/kola/files/env-godebug +++ b/tests/kola/files/env-godebug @@ -10,9 +10,7 @@ set -xeuo pipefail . $KOLA_EXT_DATA/commonlib.sh -source /etc/os-release -ostree_conf="/boot/loader.1/entries/ostree-1-${ID}.conf" -initramfs=/boot$(grep initrd ${ostree_conf} | sed 's/initrd //g') +initramfs=$(ls /boot/ostree/*/initramfs-*) conf="etc/systemd/system.conf.d/10-default-env-godebug.conf" tempd=$(mktemp -d) # unpack 10-default-env-godebug.conf from initramfs file