Skip to content

Commit 74a841b

Browse files
committed
[fix] : Fixed cleaning error
1 parent ce3d00e commit 74a841b

1 file changed

Lines changed: 3 additions & 9 deletions

File tree

build.sh

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -985,9 +985,9 @@ make_efiboot() {
985985

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

990-
cp "${work_dir}/${arch}/airootfs/usr/share/efitools/efi/HashTool.efi" "${work_dir}/efiboot/EFI/boot/"
990+
cp "${airootfs_dir}/usr/share/efitools/efi/HashTool.efi" "${work_dir}/efiboot/EFI/boot/"
991991

992992
local _bootfile="$(basename "$(ls "${airootfs_dir}/usr/lib/systemd/boot/efi/systemd-boot"*".efi" )")"
993993
cp "${airootfs_dir}/usr/lib/systemd/boot/efi/${_bootfile}" "${work_dir}/efiboot/EFI/boot/${_bootfile#systemd-}"
@@ -1080,9 +1080,7 @@ make_prepare() {
10801080
if [[ "${cleaning}" = true ]]; then
10811081
remove "${airootfs_dir}"
10821082
fi
1083-
if [[ "${noaur}" != true ]]; then
1084-
mount "${work_dir}/${arch}/airootfs.img" "${work_dir}/${arch}/airootfs"
1085-
fi
1083+
10861084
# iso version info
10871085
if [[ "${include_info}" = true ]]; then
10881086
local _write_info_file _info_file="${isofs_dir}/alteriso-info"
@@ -1128,10 +1126,6 @@ make_overisofs() {
11281126

11291127
# Build ISO
11301128
make_iso() {
1131-
1132-
if [[ "${noaur}" == false ]]; then
1133-
umount -fl "${work_dir}/${arch}/airootfs"
1134-
fi
11351129
remove "${work_dir}/airootfs"
11361130
${mkalteriso} ${mkalteriso_option} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" -A "${iso_application}" -o "${out_dir}" iso "${iso_filename}"
11371131
msg_info "The password for the live user and root is ${password}."

0 commit comments

Comments
 (0)