From e96defc4159ebfcabb0156833229f8326708b11b Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Wed, 26 Mar 2025 10:23:53 +0100
Subject: [PATCH] backport bootctl fix for 99-uki-uefi-setup.install

Resolves: RHEL-84984

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ...t-efi-in-case-BOOT_ROOT-looks-like-t.patch | 32 +++++++++++++++++++
 python-virt-firmware.spec                     | 15 ++++++---
 2 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 0001-systemd-skip-boot-efi-in-case-BOOT_ROOT-looks-like-t.patch

diff --git a/0001-systemd-skip-boot-efi-in-case-BOOT_ROOT-looks-like-t.patch b/0001-systemd-skip-boot-efi-in-case-BOOT_ROOT-looks-like-t.patch
new file mode 100644
index 0000000..fb94e54
--- /dev/null
+++ b/0001-systemd-skip-boot-efi-in-case-BOOT_ROOT-looks-like-t.patch
@@ -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
+
diff --git a/python-virt-firmware.spec b/python-virt-firmware.spec
index 5f15225..685dde0 100644
--- a/python-virt-firmware.spec
+++ b/python-virt-firmware.spec
@@ -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