Skip to content

Commit 4d87d37

Browse files
committed
[fix] : Fixed norescue_entry
1 parent 9a1976a commit 4d87d37

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

build.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -897,10 +897,6 @@ make_efiboot() {
897897

898898
mkdir -p "${work_dir}/efiboot/EFI/boot"
899899

900-
# PreLoader.efiがefitoolsのi686版に存在しません。この行を有効化するとi686ビルドに失敗します
901-
# PreLoader.efiの役割がわかりません誰かたすけてください(archiso v43で使用されていた)
902-
#cp "${airootfs_dir}/usr/share/efitools/efi/PreLoader.efi" "${work_dir}/efiboot/EFI/boot/bootx64.efi"
903-
904900
cp "${airootfs_dir}/usr/share/efitools/efi/HashTool.efi" "${work_dir}/efiboot/EFI/boot/"
905901

906902
local _bootfile="$(basename "$(ls "${airootfs_dir}/usr/lib/systemd/boot/efi/systemd-boot"*".efi" )")"
@@ -917,11 +913,10 @@ make_efiboot() {
917913
sed "s|%ARCH%|${arch}|g;" "${script_path}/efiboot/${_use_config_name}/loader.conf" > "${work_dir}/efiboot/loader/loader.conf"
918914
cp "${isofs_dir}/loader/entries/uefi-shell"* "${work_dir}/efiboot/loader/entries/"
919915

920-
local _efi_config_list=() _efi_config
921-
_efi_config_list+=($(ls "${script_path}/efiboot/${_use_config_name}/archiso-cd"*".conf" | grep -v "rescue"))
916+
local _efi_config _efi_config_list=($(ls "${script_path}/efiboot/${_use_config_name}/archiso-cd"*".conf"))
922917

923918
if [[ "${norescue_entry}" = false ]]; then
924-
_efi_config_list+=($(ls "${script_path}/efiboot/${_use_config_name}/archiso-cd"*".conf" | grep -v "rescue"))
919+
_efi_config_list=($(printf "%s\n" "${_efi_config_list[@]}" | grep -v "rescue"))
925920
fi
926921

927922
for _efi_config in "${_efi_config_list[@]}"; do

0 commit comments

Comments
 (0)