Skip to content

Commit

Permalink
tests/env-godebug: simplify initramfs finding
Browse files Browse the repository at this point in the history
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 1841132)

---

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:

ostreedev/ostree#3206
(cherry picked from commit 72bd4b0)
  • Loading branch information
jlebon committed Apr 12, 2024
1 parent b19a848 commit 4471cb1
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions tests/kola/files/env-godebug
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4471cb1

Please sign in to comment.