From cb761dc8b2ac39ed0ad82d148627029cb3112160 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 17 Nov 2017 12:44:44 -0500 Subject: [PATCH] fixup! compose: Add --ex-unified-core --- tests/compose-tests/libbasic-test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/compose-tests/libbasic-test.sh b/tests/compose-tests/libbasic-test.sh index 5497b6d7e0..61d3250361 100644 --- a/tests/compose-tests/libbasic-test.sh +++ b/tests/compose-tests/libbasic-test.sh @@ -21,8 +21,8 @@ for path in /boot /usr/lib/ostree-boot; do assert_file_has_content bootls.txt initramfs- echo "ok boot files" done -vmlinuz_line=$(grep -o '/vmlinuz.*$') -kver=$(echo ${vmlinuz_line} | sed -e 's,^/,,' -e 's,-[0-9a-f]*$,,') +vmlinuz_line=$(grep -o '/vmlinuz.*$' bootls.txt) +kver=$(echo ${vmlinuz_line} | sed -e 's,^/vmlinuz-,,' -e 's,-[0-9a-f]*$,,') ostree --repo=${repobuild} ls ${treeref} /usr/lib/modules/${kver}/{vmlinuz,initramfs.img} >/dev/null ostree --repo=${repobuild} ls -R ${treeref} /usr/share/man > manpages.txt