From 852b574d01996a371c7ef69b9bded97a8d7f6c20 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 13 Feb 2018 11:53:04 -0500 Subject: [PATCH] tests/compose: `f` is valid in a hex checksum I *think* this is why our tests started failing recently. It seems somehow very unlikely to me though that we'd somehow managed to avoid `f` in the boot checksums until now, but without doing some math...it seems plausible. Closes: #1243 Approved by: jlebon --- tests/compose-tests/test-boot-location-new.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/compose-tests/test-boot-location-new.sh b/tests/compose-tests/test-boot-location-new.sh index 710af487..4f62933d 100755 --- a/tests/compose-tests/test-boot-location-new.sh +++ b/tests/compose-tests/test-boot-location-new.sh @@ -19,7 +19,7 @@ diff -u bootls{-expected,}.txt ostree --repo=${repobuild} ls -R ${treeref} /usr/lib/ostree-boot > bootls.txt assert_file_has_content bootls.txt vmlinuz- assert_file_has_content bootls.txt initramfs- -kver=$(grep /vmlinuz bootls.txt | sed -e 's,.*/vmlinuz-\(.*\)-[0-9a-e].*$,\1,') +kver=$(grep /vmlinuz bootls.txt | sed -e 's,.*/vmlinuz-\(.*\)-[0-9a-f].*$,\1,') # And use the kver to find the kernel in /usr/lib/modules ostree --repo=${repobuild} ls ${treeref} /usr/lib/modules/${kver}/{vmlinuz,initramfs.img} >/dev/null echo "ok boot location new"