add the code to generate grub efi images

3 files changed, 56 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index a84ebf7..16ec9d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ isolinux/linux/initrd.img
 isolinux/linux/vmlinuz
 gnupghome
 secrets
+grub-efi/
diff --git a/grub-efi.sh b/grub-efi.sh
new file mode 100755
index 0000000..76ee34a
--- /dev/null
+++ b/grub-efi.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+grub_config()
+{
+    cat <<EOF
+insmod echo
+echo GRUB
+insmod part_acorn
+insmod part_amiga
+insmod part_apple
+insmod part_bsd
+insmod part_dvh
+insmod part_gpt
+insmod part_msdos
+insmod part_plan
+insmod part_sun
+insmod part_sunpc
+
+insmod linux
+insmod iso9660
+
+echo Loading vmlinuz...
+linux /linux/vmlinuz boot=samizdat components quiet splash
+echo Loading initrd.img...
+initrd /linux/initrd.img
+echo Booting.
+echo
+boot
+
+EOF
+}
+
+real_destdir=grub-efi
+destdir=grub-efi.tmp
+
+set -e
+rm -r "${destdir}" 2>/dev/null || true
+mkdir -p "${destdir}"/grub/i386-pc/
+cp -r /usr/lib/grub/i386-pc/*  "${destdir}"/grub/i386-pc/
+rm "${destdir}"/grub/i386-pc/*.img || true
+
+grub_config > "${destdir}"/load_cfg
+set -x
+grub-mkimage -O i386-pc -d /usr/lib/grub/i386-pc/ -o "${destdir}"/core.img -c "${destdir}"/load_cfg  --prefix=/grub iso9660 biosdisk
+cat /usr/lib/grub/i386-pc/cdboot.img "${destdir}"/core.img > "${destdir}"/grub/i386-pc/eltorito.img
+cat /usr/lib/grub/i386-pc/boot.img "${destdir}"/core.img > "${destdir}"/embedded.img
+
+rm -r "$real_destdir" 2>/dev/null || true
+mv -T "$destdir" "$real_destdir"
diff --git a/xorriso.test-efi.sh b/xorriso.test-efi.sh
index 99c60db..a32f4d1 100755
--- a/xorriso.test-efi.sh
+++ b/xorriso.test-efi.sh
@@ -36,6 +36,10 @@ make_gnupghome()
 
 make_gnupghome
 
+if [ grub-efi.sh -nt grub-efi ]; then
+    ./grub-efi.sh
+fi
+
 set -ex
 
 # http://www.syslinux.org/wiki/index.php?title=Isohybrid
@@ -68,11 +72,11 @@ xorriso \
         \
         \
         -as mkisofs -graft-points \
-        -b boot/grub/i386-pc/eltorito.img  \
+        -b grub/i386-pc/eltorito.img  \
         -no-emul-boot -boot-info-table \
-        --embedded-boot /home/d/src/grb/rescue/embedded.img \
+        --embedded-boot grub-efi/embedded.img \
         --protective-msdos-label \
-        boot=/home/d/src/grb/rescue/iso/boot
+        grub=grub-efi/grub
 
 # -add isolinux -- \
 # -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin \