summaryrefslogtreecommitdiff
path: root/parabolaiso
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2020-08-26 00:02:18 -0400
committerDavid P <megver83@parabola.nu>2020-08-26 00:03:41 -0400
commitebbfe24e975da3783b85ab3f2e4a4c8227a3b9ea (patch)
tree2a6c7a69d908edcd84350845564fc32d17aa76a2 /parabolaiso
parent99b2b84b09718800e4c210e25e671392cdb7e889 (diff)
mkparabolaiso: add _cleanup inside 'for' loop, improve directory creation in make_refind_efi
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'parabolaiso')
-rwxr-xr-xparabolaiso/mkparabolaiso5
1 files changed, 2 insertions, 3 deletions
diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso
index 8d7c710..08dadba 100755
--- a/parabolaiso/mkparabolaiso
+++ b/parabolaiso/mkparabolaiso
@@ -528,11 +528,10 @@ _make_efi() {
_make_refind_efi() {
_msg_info "Preparing an /EFI directory for the ISO 9660 file system..."
- install -d -m 0755 -- "${isofs_dir}/EFI/BOOT"
+ install -d -m 0755 -- "${isofs_dir}/EFI/BOOT/entries"
install -m 0644 -- "${airootfs_dir}/usr/share/refind/refind_x64.efi" \
"${isofs_dir}/EFI/BOOT/BOOTx64.EFI"
- install -d -m 0755 -- "${isofs_dir}/EFI/BOOT/entries"
install -m 0644 -- "${profile}/efiboot/EFI/BOOT/refind.conf" "${isofs_dir}/EFI/BOOT/"
sed "s|%PARABOLAISO_LABEL%|${iso_label}|g;
@@ -869,9 +868,9 @@ command_build_profile() {
done
arch="dual"
_make_bootmodes
- _run_once _cleanup
for arch in i686 x86_64; do
airootfs_dir="${work_dir}/${arch}/airootfs"
+ _run_once _cleanup
_run_once _make_prepare
done
_run_once _make_iso