Update logic for removing efi boot target

rhinstaller · Feb 26, 2025 · 62b2b52 · 62b2b52
1 parent db91afc
commit 62b2b52
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/pyanaconda/modules/storage/bootloader/efi.py b/pyanaconda/modules/storage/bootloader/efi.py
@@ -90,13 +90,14 @@ def efi_dir_as_efifs_dir(self):
     def _add_single_efi_boot_target(self, partition):
         boot_disk = partition.disk
         boot_part_num = str(partition.parted_partition.number)
+        version_id = self._get_os_version_id()
 
         create_method = "-C" if self.keep_boot_order else "-c" # pylint: disable=no-member
 
         rc = self.efibootmgr(
-            create_method, "-w", "-L", get_product_name().split("-")[0],  # pylint: disable=no-member
+            create_method, "-w", "-L", get_product_name(),  # pylint: disable=no-member
             "-d", boot_disk.path, "-p", boot_part_num,
-            "-l", self.efi_dir_as_efifs_dir + self._efi_binary,  # pylint: disable=no-member
+            "-l", self.efi_dir_as_efifs_dir + version_id + self._efi_binary,  # pylint: disable=no-member
             root=conf.target.system_root
         )
         if rc:
@@ -122,7 +123,7 @@ def remove_efi_boot_target(self):
             except ValueError:
                 continue
 
-            if _product == get_product_name().split("-")[0]:           # pylint: disable=no-member
+            if _product == get_product_name():           # pylint: disable=no-member
                 slot_id = slot[4:8]
                 # slot_id is hex, we can't use .isint and use this regex:
                 if not re.match("^[0-9a-fA-F]+$", slot_id):
@@ -150,8 +151,8 @@ def check(self):
         return True
 
     def install(self, args=None):
-        if not self.keep_boot_order:  # pylint: disable=no-member
-            self.remove_efi_boot_target()
+        # if not self.keep_boot_order:  # pylint: disable=no-member
+        #     self.remove_efi_boot_target()
         self.add_efi_boot_target()