kiss-live: fix efi boot

eudaldgr · Dec 4, 2020 · 30398c6 · 30398c6
1 parent 0de0e06
commit 30398c6
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/kiss-live b/kiss-live
@@ -154,10 +154,10 @@ make_iso()
         done
 
     print "Exporting pkgs"
-        while read -r pkg; do
+        for pkg in $base_pkgs; do
             read -r ver rel < "$rootfsdir/var/db/kiss/installed/$pkg/version"
             install -D "$rootfsdir/root/.cache/kiss/bin/$pkg@$ver-$rel.tar.xz" -t "$isodir/pkgs"
-        done < "$base_pkgs"
+        done
 
         install -D "$rootfsdir/boot/vmlinuz" -t "$isodir/boot" \
             || panic "Failed copying kernel"
@@ -183,14 +183,12 @@ make_iso()
         echo "set prefix=(\$root)/boot/grub"                   >> "$tmpdir/grub-early.cfg"
         install -D "$filesdir/grub.cfg" -t "$isodir/boot/grub"
 
-        mkdir -p "$isodir/boot/efi"
-
         # false positive
         # shellcheck disable=2086
         grub-mkimage \
             --config="$tmpdir/grub-early.cfg" \
             --prefix="/boot/grub" \
-            --output="$isodir/boot/efi/bootx64.efi" \
+            --output="$tmpdir/bootx64.efi" \
             --format="x86_64-efi" \
             --compression="xz" \
             ${grub_mod}
@@ -203,9 +201,9 @@ make_iso()
         mount -o loop "$isodir/boot/grub/efi.img" "$isodir/boot/grub/efiboot" \
             || panic "Failed mount efi.img"
 
-        install -D "$isodir/boot/efi/bootx64.efi" -t "$isodir/boot/grub/efiboot/boot/efi"
+        install -D "$tmpdir/bootx64.efi" -t "$isodir/boot/grub/efiboot/EFI/BOOT"
         umount "$isodir/boot/grub/efiboot"
-        rm -rf "$isodir/boot/grub/efiboot"
+        rm -rf "$isodir/boot/grub/efiboot" "$tmpdir/bootx64.efi" "$tmpdir/grub-early.cfg"
 
     print "Creating iso"
         rm -f "$isolabel.iso" "$isolabel.iso.md5" "$isolabel.iso.sha1"