From bfab360529cb9d5e56712f86caad5003f94bc83f Mon Sep 17 00:00:00 2001 From: nl6720 Date: Sun, 4 Oct 2020 11:28:53 +0300 Subject: Ensure that _make_boot_uefi-x64.systemd-boot.esp can be re-run if it fails Remove efiboot.img if it exists so that mkfs.fat does not fail. --- archiso/mkarchiso | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/archiso/mkarchiso b/archiso/mkarchiso index 6153c4e..b7d8038 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -561,6 +561,7 @@ _make_boot_uefi-x64.systemd-boot.esp() { )" # The FAT image must be created with mkfs.fat not mformat, as some systems have issues with mformat made images: # https://lists.gnu.org/archive/html/grub-devel/2019-04/msg00099.html + [[ -e "${isofs_dir}/EFI/archiso/efiboot.img" ]] && rm -f -- "${isofs_dir}/EFI/archiso/efiboot.img" _msg_info "Creating FAT image of size: ${efiboot_imgsize} KiB..." mkfs.fat -C -n ARCHISO_EFI "${isofs_dir}/EFI/archiso/efiboot.img" "$efiboot_imgsize" @@ -584,7 +585,7 @@ _make_boot_uefi-x64.systemd-boot.esp() { fi # Copy kernel and initramfs - _run_once _make_boot_on_fat + _make_boot_on_fat _msg_info "Done! systemd-boot set up for UEFI booting successfully." } -- cgit v1.2.3-70-g09d2