@@ -820,12 +820,10 @@ make_syslinux() {
820820
821821# Prepare /isolinux
822822make_isolinux () {
823- mkdir -p " ${isofs_dir} /isolinux"
824- sed " s|%INSTALL_DIR%|${install_dir} |g" \
825- " ${script_path} /system/isolinux.cfg" > " ${isofs_dir} /isolinux/isolinux.cfg"
826- cp " ${airootfs_dir} /usr/lib/syslinux/bios/isolinux.bin" " ${isofs_dir} /isolinux/"
827- cp " ${airootfs_dir} /usr/lib/syslinux/bios/isohdpfx.bin" " ${isofs_dir} /isolinux/"
828- cp " ${airootfs_dir} /usr/lib/syslinux/bios/ldlinux.c32" " ${isofs_dir} /isolinux/"
823+ install -d -m 0755 -- " ${isofs_dir} /syslinux"
824+ sed " s|%INSTALL_DIR%|${install_dir} |g" " ${script_path} /system/isolinux.cfg" > " ${isofs_dir} /syslinux/isolinux.cfg"
825+ install -m 0644 -- " ${airootfs_dir} /usr/lib/syslinux/bios/isolinux.bin" " ${isofs_dir} /syslinux/"
826+ install -m 0644 -- " ${airootfs_dir} /usr/lib/syslinux/bios/isohdpfx.bin" " ${isofs_dir} /syslinux/"
829827}
830828
831829# Prepare /EFI
@@ -1041,13 +1039,6 @@ make_overisofs() {
10411039# Build ISO
10421040make_iso () {
10431041 local _iso_efi_boot_args=" "
1044- if [[ ! -f " ${work_dir} /iso/isolinux/isolinux.bin" ]]; then
1045- _msg_error " The file '${work_dir} /iso/isolinux/isolinux.bin' does not exist." 1
1046- fi
1047- if [[ ! -f " ${work_dir} /iso/isolinux/isohdpfx.bin" ]]; then
1048- _msg_error " The file '${work_dir} /iso/isolinux/isohdpfx.bin' does not exist." 1
1049- fi
1050-
10511042 # If exists, add an EFI "El Torito" boot image (FAT filesystem) to ISO-9660 image.
10521043 if [[ -f " ${work_dir} /iso/EFI/alteriso/efiboot.img" ]]; then
10531044 _iso_efi_boot_args=" -eltorito-alt-boot -e EFI/alteriso/efiboot.img -no-emul-boot -isohybrid-gpt-basdat"
@@ -1065,10 +1056,10 @@ make_iso() {
10651056 -appid " ${iso_application} " \
10661057 -publisher " ${iso_publisher} " \
10671058 -preparer " prepared by AlterISO" \
1068- -eltorito-boot isolinux /isolinux.bin \
1069- -eltorito-catalog isolinux /boot.cat \
1059+ -eltorito-boot syslinux /isolinux.bin \
1060+ -eltorito-catalog syslinux /boot.cat \
10701061 -no-emul-boot -boot-load-size 4 -boot-info-table \
1071- -isohybrid-mbr ${work_dir} /iso/isolinux /isohdpfx.bin \
1062+ -isohybrid-mbr ${work_dir} /iso/syslinux /isohdpfx.bin \
10721063 ${_iso_efi_boot_args} \
10731064 -output " ${out_dir} /${iso_filename} " \
10741065 " ${work_dir} /iso/"
0 commit comments