From e8039613f7a07691309561c9c23737bd647c5035 Mon Sep 17 00:00:00 2001 From: hayao Date: Sat, 19 Sep 2020 17:38:41 +0900 Subject: [PATCH] [fix] : boot files --- allarch.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/allarch.sh b/allarch.sh index 8e9223d8..be7f974f 100755 --- a/allarch.sh +++ b/allarch.sh @@ -1071,8 +1071,8 @@ make_efiboot() { mkdir -p "${work_dir}/efiboot/EFI/archiso" - cp "${work_dir}/iso/${install_dir}/boot/${arch}/${kernel_filename}" "${work_dir}/efiboot/EFI/archiso/${kernel_filename}.efi" - cp "${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img" "${work_dir}/efiboot/EFI/archiso/archiso.img" + cp "${work_dir}/iso/${install_dir}/boot/x86_64/${kernel_filename}" "${work_dir}/efiboot/EFI/archiso/${kernel_filename}.efi" + cp "${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img" "${work_dir}/efiboot/EFI/archiso/archiso.img" cp "${work_dir}/iso/${install_dir}/boot/intel_ucode.img" "${work_dir}/efiboot/EFI/archiso/intel_ucode.img" cp "${work_dir}/iso/${install_dir}/boot/amd_ucode.img" "${work_dir}/efiboot/EFI/archiso/amd_ucode.img" @@ -1408,13 +1408,11 @@ for arch in ${all_arch[@]}; do run_once make_boot_extra run_once make_syslinux run_once make_isolinux - run_once make_efi - run_once make_efiboot + run_once make_prepare done -for arch in ${all_arch[@]}; do - [[ "${noiso}" = false ]] && run_once make_prepare -done -[[ "${noiso}" = false ]] && run_once make_iso +run_once make_efi +run_once make_efiboot +run_once make_iso [[ "${cleaning}" = true ]] && remove_work exit 0 -- 2.11.0