diff --git a/sources b/sources index a3f6d54..ad6e284 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tboot-1.11.1.tar.gz) = 6708bd2169d2b5beb6a1123b2712693d2bdc614a1a5a5a1f3858c47462cdeb3e05da3848f082e264c4d1be5f35f7ca5637bc56ebbaaff80f322bf5f4c29e4ab5 +SHA512 (tboot-1.11.3.tar.gz) = 777026cdfb31041dd7d9dd4d208c888e6fe8259171d1340ea7936f22053362ac1ec64017319626dbcb6a9a1283c8819c9a8fe1107b9b2f3898380fd0abcc047b diff --git a/tboot.spec b/tboot.spec index deec867..4d346a2 100644 --- a/tboot.spec +++ b/tboot.spec @@ -1,7 +1,7 @@ Summary: Performs a verified launch using Intel TXT Name: tboot -Version: 1.11.1 -Release: 7%{?dist} +Version: 1.11.3 +Release: 1%{?dist} Epoch: 1 License: BSD-3-Clause @@ -35,20 +35,42 @@ and verified launch of an OS kernel/VMM. # create the tboot grub entry grub2-mkconfig -o /boot/grub2/grub.cfg +# For EFI based machines ... +# Rmove the grub efi modules if they had been placed in the wrong directory by +# a previous install. +[ -d /boot/efi/EFI/redhat/x86_64-efi ] && rm -rf /boot/efi/EFI/redhat/x86_64-efi +# create the tboot grub entry +grub2-mkconfig -o /boot/grub2/grub.cfg + # For EFI based machines ... if [ -d /sys/firmware/efi ]; then echo "EFI detected .." [ -d /boot/grub2/x86_64-efi ] || mkdir -pv /boot/grub2/x86_64-efi cp -vf /usr/lib/grub/x86_64-efi/relocator.mod /boot/grub2/x86_64-efi/ cp -vf /usr/lib/grub/x86_64-efi/multiboot2.mod /boot/grub2/x86_64-efi/ + + # If there were a previous install of tboot that overwrote the + # originally installed /boot/efi/EFI/redhat/grub.cfg stub, then + # recreate it. + if grep -q -m1 tboot /boot/efi/EFI/redhat/grub.cfg; then +cat << EOF > /boot/efi/EFI/redhat/grub.cfg +search --no-floppy --fs-uuid --set=dev \ + $(lsblk -no UUID $(df -P /boot/grub2 | awk 'END{print $1}')) +set prefix=(\$dev)/grub2 +export \$prefix +configfile \$prefix/grub.cfg +EOF + chown root:root /boot/efi/EFI/redhat/grub.cfg + chmod u=rwx,go= /boot/efi/EFI/redhat/grub.cfg + fi fi %postun # Remove residual grub efi modules. [ -d /boot/grub2/x86_64-efi ] && rm -rf /boot/grub2/x86_64-efi +[ -d /boot/efi/EFI/redhat/x86_64-efi ] && rm -rf /boot/efi/EFI/redhat/x86_64-efi grub2-mkconfig -o /etc/grub2.cfg - %files %license COPYING %doc docs/* @@ -74,6 +96,10 @@ grub2-mkconfig -o /etc/grub2.cfg /boot/tboot-syms %changelog +* Tue Jun 25 2024 Tony Camuso - 1:1.11.3-1 +- Latest version of tboot. + Resolves: RHEL-34500 + * Mon Jun 24 2024 Troy Dawson - 1:1.11.1-7 - Bump release for June 2024 mass rebuild