Skip to content

Commit 23ab54c

Browse files
committed
[fix] : Fixed i686 build issue with systemd-boot
1 parent ea67d6c commit 23ab54c

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

build.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,7 +1040,10 @@ make_isolinux() {
10401040
# Prepare /EFI
10411041
make_efi() {
10421042
mkdir -p "${work_dir}/iso/EFI/boot"
1043-
cp "${work_dir}/${arch}/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi" "${work_dir}/iso/EFI/boot/bootx64.efi"
1043+
(
1044+
local __bootfile="$(basename "$(ls "${work_dir}/${arch}/airootfs/usr/lib/systemd/boot/efi/systemd-boot"*".efi" )")"
1045+
cp "${work_dir}/${arch}/airootfs/usr/lib/systemd/boot/efi/${__bootfile}" "${work_dir}/iso/EFI/boot/${__bootfile#systemd-}"
1046+
)
10441047

10451048
mkdir -p "${work_dir}/iso/loader/entries"
10461049
cp "${script_path}/efiboot/loader/loader.conf" "${work_dir}/iso/loader/"
@@ -1080,7 +1083,10 @@ make_efiboot() {
10801083
cp "${work_dir}/iso/${install_dir}/boot/amd_ucode.img" "${work_dir}/efiboot/EFI/archiso/amd_ucode.img"
10811084

10821085
mkdir -p "${work_dir}/efiboot/EFI/boot"
1083-
cp "${work_dir}/${arch}/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi" "${work_dir}/efiboot/EFI/boot/bootx64.efi"
1086+
(
1087+
local __bootfile="$(basename "$(ls "${work_dir}/${arch}/airootfs/usr/lib/systemd/boot/efi/systemd-boot"*".efi" )")"
1088+
cp "${work_dir}/${arch}/airootfs/usr/lib/systemd/boot/efi/${__bootfile}" "${work_dir}/iso/EFI/boot/${__bootfile#systemd-}"
1089+
)
10841090

10851091
mkdir -p "${work_dir}/efiboot/loader/entries"
10861092
cp "${script_path}/efiboot/loader/loader.conf" "${work_dir}/efiboot/loader/"

0 commit comments

Comments
 (0)