@@ -849,34 +849,25 @@ make_isolinux() {
849849
850850# Prepare /EFI
851851make_efi () {
852- mkdir -p " ${isofs_dir} /EFI/boot "
852+ install -d -m 0755 -- " ${isofs_dir} /EFI/BOOT "
853853
854854 local _bootfile=" $( basename " $( ls " ${airootfs_dir} /usr/lib/systemd/boot/efi/systemd-boot" * " .efi" ) " ) "
855- cp " ${airootfs_dir} /usr/lib/systemd/boot/efi/${_bootfile} " " ${isofs_dir} /EFI/boot/${_bootfile# systemd-} "
855+ # cp "${airootfs_dir}/usr/lib/systemd/boot/efi/${_bootfile}" "${isofs_dir}/EFI/boot/${_bootfile#systemd-}"
856+ install -m 0644 -- " ${airootfs_dir} /usr/lib/systemd/boot/efi/${_bootfile} " " ${isofs_dir} /EFI/boot/${_bootfile# systemd-} "
856857
857- local _use_config_name
858+ local _use_config_name= " nosplash "
858859 if [[ " ${boot_splash} " = true ]]; then
859860 _use_config_name=" splash"
860- else
861- _use_config_name=" nosplash"
862861 fi
863862
864- mkdir -p " ${isofs_dir} /loader/entries"
863+ install -d -m 0755 -- " ${isofs_dir} /loader/entries"
865864 sed " s|%ARCH%|${arch} |g;" " ${script_path} /efiboot/${_use_config_name} /loader.conf" > " ${isofs_dir} /loader/loader.conf"
866865
867866 local _efi_config_list=() _efi_config
868- _efi_config_list+=(
869- $(
870- ls " ${script_path} /efiboot/${_use_config_name} /archiso-usb" * " .conf" | grep -v " rescue"
871- )
872- )
867+ _efi_config_list+=($( ls " ${script_path} /efiboot/${_use_config_name} /archiso-usb" * " .conf" | grep -v " rescue" ) )
873868
874869 if [[ " ${norescue_entry} " = false ]]; then
875- _efi_config_list+=(
876- $(
877- ls " ${script_path} /efiboot/${_use_config_name} /archiso-usb" * " .conf" | grep -v " rescue"
878- )
879- )
870+ _efi_config_list+=($( ls " ${script_path} /efiboot/${_use_config_name} /archiso-usb" * " .conf" | grep -v " rescue" ) )
880871 fi
881872
882873 for _efi_config in ${_efi_config_list[@]} ; do
@@ -1012,7 +1003,9 @@ make_prepare() {
10121003 if [[ " ${cleaning} " = true ]]; then
10131004 remove " ${airootfs_dir} "
10141005 fi
1006+ }
10151007
1008+ make_alteriso_info (){
10161009 # iso version info
10171010 if [[ " ${include_info} " = true ]]; then
10181011 local _info_file=" ${isofs_dir} /alteriso-info" _version=" ${iso_version} "
@@ -1289,6 +1282,7 @@ if [[ "${noiso}" = false ]]; then
12891282 run_once make_efi
12901283 run_once make_efiboot
12911284 fi
1285+ run_once make_alteriso_info
12921286 run_once make_prepare
12931287 run_once make_overisofs
12941288 run_once make_iso
0 commit comments