Skip to content

Commit 00e86b7

Browse files
committed
[update] : Copy all architecture shell
1 parent c42fb2b commit 00e86b7

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

build.sh

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1105,9 +1105,14 @@ make_efi() {
11051105

11061106
# edk2-shell based UEFI shell
11071107
# shellx64.efi is picked up automatically when on /
1108-
if [[ "${arch}" = "x86_64" ]]; then
1109-
cp "${work_dir}/${arch}/airootfs/usr/share/edk2-shell/x64/Shell_Full.efi" "${work_dir}/iso/shellx64.efi"
1110-
fi
1108+
#if [[ "${arch}" = "x86_64" ]]; then
1109+
# cp "${work_dir}/${arch}/airootfs/usr/share/edk2-shell/x64/Shell_Full.efi" "${work_dir}/iso/shellx64.efi"
1110+
#fi
1111+
1112+
local _efi_shell_arch
1113+
for _efi_shell_arch in "${work_dir}/${arch}/airootfs/usr/share/edk2-shell/"*; do
1114+
cp "${work_dir}/${arch}/airootfs/usr/share/edk2-shell/${_efi_shell_arch}/Shell_Full.efi" "${work_dir}/iso/shell_${_efi_shell_arch}.efi"
1115+
done
11111116
}
11121117

11131118
# Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
@@ -1145,9 +1150,12 @@ make_efiboot() {
11451150
"${script_path}/efiboot/loader/entries/archiso-cd.conf" > "${work_dir}/efiboot/loader/entries/archiso-${arch}.conf"
11461151

11471152
# shellx64.efi is picked up automatically when on /
1148-
if [[ "${arch}" = "x86_64" ]]; then
1149-
cp "${work_dir}/iso/shellx64.efi" "${work_dir}/efiboot/"
1150-
fi
1153+
#if [[ "${arch}" = "x86_64" ]]; then
1154+
# cp "${work_dir}/iso/shellx64.efi" "${work_dir}/efiboot/"
1155+
#fi
1156+
1157+
cp "${work_dir}/iso/shell"*".efi" "${work_dir}/efiboot/"
1158+
11511159

11521160
umount -d "${work_dir}/efiboot"
11531161
}

0 commit comments

Comments
 (0)