From 12466386d7bdf213c1eef5a951c713c869f08f11 Mon Sep 17 00:00:00 2001 From: Freddie Rice Date: Wed, 20 Sep 2017 12:59:09 -0400 Subject: [PATCH] xen.efi upgraded during each install (cherry picked from commit e3a4a469589eff5aebce100d833098a317e0a387) --- anaconda/pyanaconda/bootloader.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/anaconda/pyanaconda/bootloader.py b/anaconda/pyanaconda/bootloader.py index 20e153b..4490f96 100644 --- a/anaconda/pyanaconda/bootloader.py +++ b/anaconda/pyanaconda/bootloader.py @@ -1819,12 +1819,15 @@ class XenEFI(EFIGRUB): boot_part_num = self.stage1_device.parents[0].partedPartition.number boot_part_num = str(boot_part_num) - if not os.path.exists( - "{}/{}".format(iutil.getSysroot() + self.config_dir, "xen.efi")): - xen_efi = [x for x in os.listdir(iutil.getSysroot() + self.config_dir) if - x.startswith('xen-') and x.endswith('.efi')][0] - shutil.copy("{}/{}".format(iutil.getSysroot() + self.config_dir, xen_efi), - "{}/{}".format(iutil.getSysroot() + self.config_dir, "xen.efi")) + # could be an old version, replace in case + xen_efi_target = "{}/{}".format(iutil.getSysroot() + self.config_dir, "xen.efi") + if os.path.exists(xen_efi_target): + os.remove(xen_efi_target) + + xen_efi = [x for x in os.listdir(iutil.getSysroot() + self.config_dir) if + x.startswith('xen-') and x.endswith('.efi')][0] + shutil.copy("{}/{}".format(iutil.getSysroot() + self.config_dir, xen_efi), + "{}/{}".format(iutil.getSysroot() + self.config_dir, "xen.efi")) rc = self.efibootmgr("-c", "-w", "-L", productName, "-d", boot_disk.path, "-p", boot_part_num, "-l",