util-iso-boot: fix efi loader copy
This commit is contained in:
parent
1b4795e351
commit
40c7851f37
2 changed files with 10 additions and 3 deletions
|
@ -65,11 +65,14 @@ gen_boot_image(){
|
||||||
-g /boot/${iso_name}.img
|
-g /boot/${iso_name}.img
|
||||||
}
|
}
|
||||||
|
|
||||||
copy_efi_loaders(){
|
copy_preloader_efi(){
|
||||||
msg2 "Copying efi loaders ..."
|
msg2 "Copying efi loaders ..."
|
||||||
cp $1/usr/share/efitools/efi/PreLoader.efi $2/bootx64.efi
|
cp $1/usr/share/efitools/efi/PreLoader.efi $2/bootx64.efi
|
||||||
cp $1/usr/share/efitools/efi/HashTool.efi $2/
|
cp $1/usr/share/efitools/efi/HashTool.efi $2/
|
||||||
# cp $1/usr/share/efitools/efi/Loader.efi $2/loader.efi
|
# cp $1/usr/share/efitools/efi/Loader.efi $2/loader.efi
|
||||||
|
}
|
||||||
|
|
||||||
|
copy_loader_efi(){
|
||||||
cp $1/usr/lib/systemd/boot/efi/systemd-bootx64.efi $2/loader.efi
|
cp $1/usr/lib/systemd/boot/efi/systemd-bootx64.efi $2/loader.efi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -332,7 +332,9 @@ make_efi() {
|
||||||
mkdir -p ${work_dir}/iso/EFI/boot
|
mkdir -p ${work_dir}/iso/EFI/boot
|
||||||
mkdir -p ${work_dir}/iso/loader/entries
|
mkdir -p ${work_dir}/iso/loader/entries
|
||||||
|
|
||||||
copy_efi_loaders "${work_dir}/live-image" "${work_dir}/iso/EFI/boot"
|
copy_preloader_efi "${work_dir}/live-image" "${work_dir}/iso/EFI/boot"
|
||||||
|
copy_loader_efi "${work_dir}/root-image" "${work_dir}/iso/EFI/boot"
|
||||||
|
|
||||||
write_loader_conf "${work_dir}/iso/loader"
|
write_loader_conf "${work_dir}/iso/loader"
|
||||||
write_usb_efi_loader_conf "${work_dir}" "no"
|
write_usb_efi_loader_conf "${work_dir}" "no"
|
||||||
if ${nonfree_mhwd};then
|
if ${nonfree_mhwd};then
|
||||||
|
@ -364,7 +366,9 @@ make_efiboot() {
|
||||||
|
|
||||||
copy_boot_images "${work_dir}/iso/${iso_name}/boot" "${work_dir}/efiboot/EFI/miso"
|
copy_boot_images "${work_dir}/iso/${iso_name}/boot" "${work_dir}/efiboot/EFI/miso"
|
||||||
|
|
||||||
copy_efi_loaders "${work_dir}/live-image" "${work_dir}/efiboot/EFI/boot"
|
copy_preloader_efi "${work_dir}/live-image" "${work_dir}/efiboot/EFI/boot"
|
||||||
|
copy_loader_efi "${work_dir}/root-image" "${work_dir}/efiboot/EFI/boot"
|
||||||
|
|
||||||
write_loader_conf "${work_dir}/efiboot/loader"
|
write_loader_conf "${work_dir}/efiboot/loader"
|
||||||
write_dvd_efi_loader_conf "${work_dir}" "no"
|
write_dvd_efi_loader_conf "${work_dir}" "no"
|
||||||
if ${nonfree_mhwd};then
|
if ${nonfree_mhwd};then
|
||||||
|
|
Loading…
Reference in a new issue