Skip to content

Commit c79f252

Browse files
committed
[fix] : Use airootfs_dir
1 parent 5ef6529 commit c79f252

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ umount_chroot () {
187187
if [[ ! -d "${build_dir}" ]]; then
188188
return 0
189189
fi
190-
for _mount in $(cat "/proc/mounts" | getclm 2 | grep "$(realpath -s ${build_dir})" | tac | grep -xv "$(realpath -s ${build_dir})/${arch}/airootfs"); do
190+
for _mount in $(cat "/proc/mounts" | getclm 2 | grep "$(realpath -s ${build_dir})" | tac | grep -xv "$(realpath -s ${airootfs_dir})"); do
191191
if echo "${_mount}" | grep "${work_dir}" > /dev/null 2>&1 || echo "${_mount}" | grep "${script_path}" > /dev/null 2>&1 || echo "${_mount}" | grep "${out_dir}" > /dev/null 2>&1; then
192192
msg_info "Unmounting ${_mount}"
193193
_umount "${_mount}" 2> /dev/null
@@ -197,7 +197,7 @@ umount_chroot () {
197197
done
198198
}
199199

200-
# Mount airootfs on "${build_dir}/${arch}/airootfs"
200+
# Mount airootfs on "${airootfs_dir}"
201201
mount_airootfs () {
202202
mkdir -p "${airootfs_dir}"
203203
_mount "${airootfs_dir}.img" "${airootfs_dir}"
@@ -817,7 +817,7 @@ make_syslinux() {
817817
if [[ "${memtest86}" = false ]]; then _remove_config memtest86.cfg; fi
818818

819819
# copy files
820-
cp "${build_dir}"/${arch}/airootfs/usr/lib/syslinux/bios/*.c32 "${isofs_dir}/syslinux"
820+
cp "${airootfs_dir}/usr/lib/syslinux/bios/"*.c32 "${isofs_dir}/syslinux"
821821
cp "${airootfs_dir}/usr/lib/syslinux/bios/lpxelinux.0" "${isofs_dir}/syslinux"
822822
cp "${airootfs_dir}/usr/lib/syslinux/bios/memdisk" "${isofs_dir}/syslinux"
823823

0 commit comments

Comments
 (0)