mirror of
https://github.com/ostreedev/ostree.git
synced 2024-12-23 21:35:26 +03:00
9f48e212a3
Currently the BLS snippets are named ostree-$ID-$VARIANT_ID-$index.conf, but the BLS config files are actually sorted by using the version field which is the inverse of the index. In most places, _ostree_sysroot_read_boot_loader_configs() is used to get the BLS files and this function already returns them sorted by the version field. The only place where the index trailing number is used is in the ostree-grub-generator script that lists the BLS files to populate the grub config file. But for some bootloaders the BLS filename is the criteria for sorting by taking the filename as a string version. So on these bootloaders the BLS entries will be listed in the reverse order. To avoid that, change the BLS snippets filename to have the version field instead of the index and also to have the version before deployment name. Make the filenames to be of the form ostree-$version-$ID-$VARIANT_ID.conf so the version is before the deployment name. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> Closes: #1654 Approved by: cgwalters
91 lines
4.3 KiB
Bash
Executable File
91 lines
4.3 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
. $(dirname $0)/libtest.sh
|
|
|
|
echo "1..10"
|
|
|
|
setup_os_repository "archive-z2" "uboot"
|
|
|
|
cd ${test_tmpdir}
|
|
|
|
${CMD_PREFIX} ostree --repo=sysroot/ostree/repo remote add --set=gpg-verify=false testos $(cat httpd-address)/ostree/testos-repo
|
|
${CMD_PREFIX} ostree --repo=sysroot/ostree/repo pull testos testos/buildmaster/x86_64-runtime
|
|
${CMD_PREFIX} ostree admin deploy --karg=root=LABEL=rootfs --os=testos testos:testos/buildmaster/x86_64-runtime
|
|
|
|
assert_file_has_content sysroot/boot/loader/entries/ostree-1-testos.conf 'root=LABEL=rootfs'
|
|
assert_not_file_has_content sysroot/boot/loader/entries/ostree-1-testos.conf 'init='
|
|
|
|
echo "ok deployment with initramfs"
|
|
|
|
pull_test_tree() {
|
|
kernel_contents=$1
|
|
initramfs_contents=$2
|
|
devicetree_contents=$3
|
|
|
|
printf "TEST SETUP:\n kernel: %s\n initramfs: %s\n devicetree: %s\n layout: %s\n" \
|
|
"$kernel_contents" "$initramfs_contents" "$devicetree_contents" "$layout"
|
|
|
|
rm -rf ${test_tmpdir}/osdata/usr/lib/modules/3.6.0/{initramfs.img,vmlinuz,devicetree} \
|
|
${test_tmpdir}/osdata/usr/lib/ostree-boot \
|
|
${test_tmpdir}/osdata/boot
|
|
if [ "$layout" = "/usr/lib/modules" ]; then
|
|
# Fedora compatible layout
|
|
cd ${test_tmpdir}/osdata/usr/lib/modules/3.6.0
|
|
echo -n "$kernel_contents" > vmlinuz
|
|
[ -n "$initramfs_contents" ] && echo -n "$initramfs_contents" > initramfs.img
|
|
[ -n "$devicetree_contents" ] && echo -n "$devicetree_contents" > devicetree
|
|
elif [ "$layout" = "/usr/lib/ostree-boot" ] || [ "$layout" = "/boot" ]; then
|
|
# "Legacy" layout
|
|
mkdir -p "${test_tmpdir}/osdata/$layout"
|
|
cd "${test_tmpdir}/osdata/$layout"
|
|
bootcsum=$(echo -n "$kernel_contents$initramfs_contents$devicetree_contents" \
|
|
| sha256sum | cut -f 1 -d ' ')
|
|
echo -n "$kernel_contents" > vmlinuz-${bootcsum}
|
|
[ -n "$initramfs_contents" ] && echo -n "$initramfs_contents" > initramfs-${bootcsum}
|
|
[ -n "$devicetree_contents" ] && echo -n "$devicetree_contents" > devicetree-${bootcsum}
|
|
else
|
|
exit 1
|
|
fi
|
|
cd -
|
|
${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit --tree=dir=osdata/ -b testos/buildmaster/x86_64-runtime
|
|
${CMD_PREFIX} ostree pull testos:testos/buildmaster/x86_64-runtime
|
|
}
|
|
|
|
get_key_from_bootloader_conf() {
|
|
conffile=$1
|
|
key=$2
|
|
|
|
assert_file_has_content "$conffile" "^$key"
|
|
awk "/^$key/ { print \$2 }" "$conffile"
|
|
}
|
|
|
|
for layout in /usr/lib/modules /usr/lib/ostree-boot /boot;
|
|
do
|
|
pull_test_tree "the kernel only"
|
|
${CMD_PREFIX} ostree admin deploy --os=testos --karg=root=/dev/sda2 --karg=rootwait testos:testos/buildmaster/x86_64-runtime
|
|
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'rootwait'
|
|
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'init='
|
|
assert_not_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'initrd'
|
|
|
|
echo "ok switching to bootdir with no initramfs layout=$layout"
|
|
|
|
pull_test_tree "the kernel" "initramfs to assist the kernel"
|
|
${CMD_PREFIX} ostree admin deploy --os=testos --karg-none --karg=root=LABEL=rootfs testos:testos/buildmaster/x86_64-runtime
|
|
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'initrd'
|
|
assert_file_has_content sysroot/boot/$(get_key_from_bootloader_conf sysroot/boot/loader/entries/ostree-2-testos.conf "initrd") "initramfs to assist the kernel"
|
|
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'root=LABEL=rootfs'
|
|
assert_not_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'rootwait'
|
|
assert_not_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'init='
|
|
|
|
echo "ok switching from no initramfs to initramfs enabled sysroot layout=$layout"
|
|
|
|
pull_test_tree "the kernel" "" "my .dtb file"
|
|
${CMD_PREFIX} ostree admin deploy --os=testos testos:testos/buildmaster/x86_64-runtime
|
|
|
|
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'init='
|
|
assert_file_has_content sysroot/boot/"$(get_key_from_bootloader_conf sysroot/boot/loader/entries/ostree-2-testos.conf 'devicetree')" "my .dtb file"
|
|
assert_not_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'initrd'
|
|
|
|
echo "ok switching from initramfs to no initramfs sysroot with devicetree layout=$layout"
|
|
done
|