Skip to content

Commit ea67d6c

Browse files
committed
[fix] : Fixed directory name when building with i686
1 parent 19e9977 commit ea67d6c

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

build.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@ make_customize_airootfs() {
911911

912912
# /root permission
913913
# https://github.com/archlinux/archiso/commit/d39e2ba41bf556674501062742190c29ee11cd59
914-
chmod -f 750 "${work_dir}/x86_64/airootfs/root"
914+
chmod -f 750 "${work_dir}/${arch}/airootfs/root"
915915
}
916916

917917
# Copy mkinitcpio archiso hooks and build initramfs (airootfs)
@@ -1052,7 +1052,9 @@ make_efi() {
10521052

10531053
# edk2-shell based UEFI shell
10541054
# shellx64.efi is picked up automatically when on /
1055-
cp "${work_dir}/x86_64/airootfs/usr/share/edk2-shell/x64/Shell_Full.efi" "${work_dir}/iso/shellx64.efi"
1055+
if [[ -f "${work_dir}/${arch}/airootfs/usr/share/edk2-shell/x64/Shell_Full.efi" ]]; then
1056+
cp "${work_dir}/${arch}/airootfs/usr/share/edk2-shell/x64/Shell_Full.efi" "${work_dir}/iso/shellx64.efi"
1057+
fi
10561058
}
10571059

10581060
# Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
@@ -1090,7 +1092,9 @@ make_efiboot() {
10901092
"${script_path}/efiboot/loader/entries/cd/archiso-x86_64-cd-${kernel}.conf" > "${work_dir}/efiboot/loader/entries/archiso-x86_64.conf"
10911093

10921094
# shellx64.efi is picked up automatically when on /
1093-
cp "${work_dir}/iso/shellx64.efi" "${work_dir}/efiboot/"
1095+
if [[ -f "${work_dir}/iso/shellx64.efi" ]]; then
1096+
cp "${work_dir}/iso/shellx64.efi" "${work_dir}/efiboot/"
1097+
fi
10941098

10951099
umount -d "${work_dir}/efiboot"
10961100
}

0 commit comments

Comments
 (0)