Johannes/ISO
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure that _make_boot_uefi-x64.systemd-boot.esp can be re-run if it fails

Browse Source 
Remove efiboot.img if it exists so that mkfs.fat does not fail.
This commit is contained in:
nl6720 2020-10-04 11:28:53 +03:00
parent f45fc29fe0
commit bfab360529
No known key found for this signature in database
GPG Key ID: 5CE88535E188D369
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
archiso/mkarchiso
View File

@ -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() {
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."
} }