root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

util-iso-boot: fix copy_boot_images()

Browse source
This commit is contained in:
udeved 2016-10-06 14:08:53 +02:00
parent 94d0d4defb
commit 0bad593d36
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/util-iso-boot.sh
View file

@ -71,8 +71,8 @@ copy_ucode(){
copy_boot_images(){
msg2 "Copying boot images ..."
cp $1/x86_64/${iso_name} $1/efiboot/EFI/miso/${iso_name}.efi
cp $1/x86_64/${iso_name}.img $1/efiboot/EFI/miso/${iso_name}.img
cp $1/iso/${iso_name}/boot/x86_64/${iso_name} $1/efiboot/EFI/miso/${iso_name}.efi
cp $1/iso/${iso_name}/boot/x86_64/${iso_name}.img $1/efiboot/EFI/miso/${iso_name}.img
if $(is_intel_ucode "$1"); then
cp $1/iso/${iso_name}/boot/intel_ucode.img $1/efiboot/EFI/miso/intel_ucode.img
fi
@ -128,7 +128,7 @@ write_dvd_efi_loader_entry(){
}
copy_isolinux_bin(){
msg2 "Copying isolinux bios binaries ..."
msg2 "Copying isolinux bios binaries ..."
cp $1/usr/lib/syslinux/bios/{{isolinux,isohdpfx}.bin,{ldlinux,gfxboot,whichsys,mboot,hdt,chain,libcom32,libmenu,libutil,libgpl}.c32} $2/iso/isolinux
}

8
lib/util-iso.sh
View file

@ -337,10 +337,10 @@ make_efi() {
if ${nonfree_mhwd};then
write_usb_efi_loader_entry "${work_dir}" "yes"
fi
# copy_syslinux_efi "${work_dir}/live-image" "${boot}"
# write_syslinux_cfg "${boot}" "usb"
: > ${work_dir}/build.${FUNCNAME}
msg "Done [%s/boot/EFI]" "${iso_name}"
fi
@ -358,7 +358,7 @@ make_efiboot() {
mount ${miso}/${iso_name}.img ${work_dir}/efiboot
mkdir -p ${work_dir}/efiboot/EFI/{miso,boot}
copy_boot_images "${work_dir}"
local boot=${work_dir}/efiboot/EFI/boot
copy_preloader_efi "${work_dir}/live-image" "${boot}"
copy_loader_efi "${work_dir}/root-image" "${boot}"
@ -372,7 +372,7 @@ make_efiboot() {
# write_syslinux_cfg "${boot}" "dvd"
umount ${work_dir}/efiboot
: > ${work_dir}/build.${FUNCNAME}
msg "Done [%s/iso/EFI]" "${iso_name}"
fi