summaryrefslogtreecommitdiff
path: root/parabolaiso/mkparabolaiso
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2020-08-27 15:08:31 -0400
committerDavid P <megver83@parabola.nu>2020-08-27 15:22:13 -0400
commit681ddcf35ef3fa50bf48084f23c558671904da4c (patch)
tree86736eca6d3a3a2dd8b075f1e2d6f18d70b6bf1a /parabolaiso/mkparabolaiso
parente0378a878770e31bfdb99c9dfe3db629849106e0 (diff)
mkparabolaiso: fix typos, rearrange some code
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'parabolaiso/mkparabolaiso')
-rwxr-xr-xparabolaiso/mkparabolaiso7
1 files changed, 3 insertions, 4 deletions
diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso
index 08dadba..6e458cf 100755
--- a/parabolaiso/mkparabolaiso
+++ b/parabolaiso/mkparabolaiso
@@ -433,9 +433,7 @@ _make_bootmodes() {
# Prepare kernel/initramfs ${install_dir}/boot/
_make_boot_on_iso() {
- local airootfs_dir="${work_dir}/${arch}/airootfs"
-
- _msg_info "Preparing kernel and intramfs for the ISO 9660 file system..."
+ _msg_info "Preparing ${arch} kernel and initramfs for the ISO 9660 file system..."
install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/${arch}"
install -m 0644 -- "${airootfs_dir}/boot/parabolaiso.img" "${isofs_dir}/${install_dir}/boot/${arch}/"
install -m 0644 -- "${airootfs_dir}/boot/vmlinuz-linux-libre" "${isofs_dir}/${install_dir}/boot/${arch}/"
@@ -461,6 +459,7 @@ _make_boot_bios.syslinux.mbr() {
if [[ "${arch}" == "dual" ]]; then
for arch in i686 x86_64; do
+ airootfs_dir="${work_dir}/${arch}/airootfs"
_run_once _make_boot_on_iso
done
else
@@ -549,7 +548,7 @@ _make_refind_efi() {
# Prepare kernel/initramfs on efiboot.img
_make_boot_on_fat() {
- _msg_info "Preparing kernel and intramfs for the FAT file system..."
+ _msg_info "Preparing kernel and initramfs for the FAT file system..."
install -d -m 0755 -- "${work_dir}/mnt/efiboot/EFI/parabolaiso"
install -m 0644 -- "${airootfs_dir}/boot/vmlinuz-linux-libre" "${work_dir}/mnt/efiboot/EFI/parabolaiso/"
install -m 0644 -- "${airootfs_dir}/boot/parabolaiso.img" "${work_dir}/mnt/efiboot/EFI/parabolaiso/"