rpms/python-virt-firmware
6
0
Fork 0
Code Issues Pull Requests Releases Activity

backport bootctl fix for 99-uki-uefi-setup.install

Browse Source 
Resolves: RHEL-84984

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2025-03-26 10:23:53 +01:00
parent c78b07da18
commit e96defc415
2 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
0001-systemd-skip-boot-efi-in-case-BOOT_ROOT-looks-like-t.patch Normal file
View File

@ -0,0 +1,32 @@
From ca385db4f74a4d542455b9d40c91c8448c7be90c Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Thu, 20 Mar 2025 09:04:32 +0100
Subject: [PATCH] systemd: skip /boot/efi in case $BOOT_ROOT looks like the ESP
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
systemd/99-uki-uefi-setup.install | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/systemd/99-uki-uefi-setup.install b/systemd/99-uki-uefi-setup.install
index 26c8c018683b..773491198433 100755
--- a/systemd/99-uki-uefi-setup.install
+++ b/systemd/99-uki-uefi-setup.install
@@ -16,7 +16,13 @@ ENTRY_TOKEN="$KERNEL_INSTALL_ENTRY_TOKEN"
BOOT_ROOT="$KERNEL_INSTALL_BOOT_ROOT"
UKI_DIR_BOOT="$BOOT_ROOT/EFI/Linux"
-UKI_DIR_ESP="`bootctl -p`/EFI/Linux"
+if test -d "$BOOT_ROOT/EFI/BOOT"; then
+ # looks like $BOOT_ROOT points to the ESP
+ UKI_DIR_ESP="$UKI_DIR_BOOT"
+else
+ # must find ESP mount point
+ UKI_DIR_ESP="`bootctl -p`/EFI/Linux"
+fi
LOADER_INFO="$(kernel-bootcfg --print-loader)"
case "$LOADER_INFO" in
--
2.49.0

15
python-virt-firmware.spec
View File

@ -2,12 +2,13 @@
Name: python-virt-firmware
Version: %{pypi_version}
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Tools for virtual machine firmware volumes
License: GPLv2
URL: https://pypi.org/project/virt-firmware/
Source0: virt_firmware-%{pypi_version}.tar.gz
Patch1: 0001-systemd-skip-boot-efi-in-case-BOOT_ROOT-looks-like-t.patch
BuildArch: noarch
BuildRequires: python3-devel
@ -54,7 +55,7 @@ kernel-install plugin and systemd unit to manage automatic
UKI (unified kernel image) updates.
%prep
%autosetup -n virt_firmware-%{pypi_version}
%autosetup -n virt_firmware-%{pypi_version} -p1
%build
%py3_build
@ -69,9 +70,9 @@ mkdir -p %{buildroot}%{_datadir}/%{name}
cp -ar tests %{buildroot}%{_datadir}/%{name}
# uki-direct
install -m 755 -d %{buildroot}%{_unitdir}
install -m 755 -d %{buildroot}%{_libdir}/kernel/install.d
install -m 755 -d %{buildroot}%{_prefix}/lib/kernel/install.d
install -m 644 systemd/kernel-bootcfg-boot-successful.service %{buildroot}%{_unitdir}
install -m 755 systemd/99-uki-uefi-setup.install %{buildroot}%{_libdir}/kernel/install.d
install -m 755 systemd/99-uki-uefi-setup.install %{buildroot}%{_prefix}/lib/kernel/install.d
%post -n uki-direct
%systemd_post kernel-bootcfg-boot-successful.service
@ -109,9 +110,13 @@ install -m 755 systemd/99-uki-uefi-setup.install %{buildroot}%{_libdir}/kernel/i
%files -n uki-direct
%{_unitdir}/kernel-bootcfg-boot-successful.service
%{_libdir}/kernel/install.d/99-uki-uefi-setup.install
%{_prefix}/lib/kernel/install.d/99-uki-uefi-setup.install
%changelog
* Wed Mar 26 2025 Gerd Hoffmann <kraxel@redhat.com> - 24.11-2
- backport bootctl fix for 99-uki-uefi-setup.install
- Resolves: RHEL-84984
* Fri Nov 29 2024 Gerd Hoffmann <kraxel@redhat.com> - 24.11-1
- update to version 24.11
- Resolves: RHEL-69507