Verified Commit bfab3605 authored by nl6720's avatar nl6720
Browse files

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.
parent f45fc29f
...@@ -561,6 +561,7 @@ _make_boot_uefi-x64.systemd-boot.esp() { ...@@ -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: # 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 # 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..." _msg_info "Creating FAT image of size: ${efiboot_imgsize} KiB..."
mkfs.fat -C -n ARCHISO_EFI "${isofs_dir}/EFI/archiso/efiboot.img" "$efiboot_imgsize" 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() { ...@@ -584,7 +585,7 @@ _make_boot_uefi-x64.systemd-boot.esp() {
fi fi
# Copy kernel and initramfs # 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." _msg_info "Done! systemd-boot set up for UEFI booting successfully."
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment