@@ -1014,17 +1014,6 @@ make_boot_extra() {
10141014 cp " ${airootfs_dir} /usr/share/licenses/common/GPL2/license.txt" " ${isofs_dir} /${install_dir} /boot/memtest.COPYING"
10151015 fi
10161016
1017- :<< OLD
1018- if [[ -e "${airootfs_dir} /boot/intel-ucode.img" ]]; then
1019- cp "${airootfs_dir} /boot/intel-ucode.img" "${isofs_dir} /${install_dir} /boot/intel_ucode.img"
1020- cp "${airootfs_dir} /usr/share/licenses/intel-ucode/LICENSE" "${isofs_dir} /${install_dir} /boot/intel_ucode.LICENSE"
1021- fi
1022- if [[ -e "${airootfs_dir} /boot/amd-ucode.img" ]]; then
1023- cp "${airootfs_dir} /boot/amd-ucode.img" "${isofs_dir} /${install_dir} /boot/amd_ucode.img"
1024- cp "${airootfs_dir} /usr/share/licenses/amd-ucode/LICENSE.amd-ucode" "${isofs_dir} /${install_dir} /boot/amd_ucode.LICENSE"
1025- fi
1026- OLD
1027-
10281017 local _ucode_image
10291018 msg_info " Preparing microcode for the ISO 9660 file system..."
10301019
@@ -1127,11 +1116,6 @@ make_efi() {
11271116 " ${script_path} /efiboot/loader/entries/archiso-usb.conf" > " ${isofs_dir} /loader/entries/archiso-${arch} .conf"
11281117
11291118 # edk2-shell based UEFI shell
1130- # shellx64.efi is picked up automatically when on /
1131- # if [[ "${arch}" = "x86_64" ]]; then
1132- # cp "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" "${isofs_dir}/shellx64.efi"
1133- # fi
1134-
11351119 local _efi_shell _efi_shell_arch
11361120 for _efi_shell in " ${work_dir} " /${arch} /airootfs/usr/share/edk2-shell/* ; do
11371121 _efi_shell_arch=" $( basename ${_efi_shell} ) "
@@ -1183,14 +1167,8 @@ make_efiboot() {
11831167 s|%INSTALL_DIR%|${install_dir} |g" \
11841168 " ${script_path} /efiboot/loader/entries/archiso-cd.conf" > " ${work_dir} /efiboot/loader/entries/archiso-${arch} .conf"
11851169
1186- # shellx64.efi is picked up automatically when on /
1187- # if [[ "${arch}" = "x86_64" ]]; then
1188- # cp "${isofs_dir}/shellx64.efi" "${work_dir}/efiboot/"
1189- # fi
1190-
11911170 cp " ${isofs_dir} /shell" * " .efi" " ${work_dir} /efiboot/"
11921171
1193-
11941172 umount -d " ${work_dir} /efiboot"
11951173}
11961174
0 commit comments