add grub modules, add error message if efi files are not available

faiproject · Jan 2, 2020 · 98f5589 · 98f5589
1 parent e9e0c9e
commit 98f5589
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/bin/fai-cd b/bin/fai-cd
@@ -206,13 +206,15 @@ create_grub2_image() {
 	mkfs.vfat $scratch/efiboot.img
 	mmd -i $scratch/efiboot.img efi efi/boot
 	mcopy -i $scratch/efiboot.img $scratch/bootx64.efi ::efi/boot/
+    else
+        die 11 "No grub-efi-amd64-bin installation found in NFSROOT. Aborting."
     fi
     if [ -d $NFSROOT/usr/lib/grub/i386-pc ]; then
 	chroot $NFSROOT grub-mkstandalone \
 	    --format=i386-pc \
 	    --output=/tmp/core.img \
 	    --locales="" --fonts="" \
-	    --install-modules="linux normal iso9660 biosdisk memdisk search ls" \
+	    --install-modules="linux normal iso9660 biosdisk memdisk search ls echo test chain" \
 	    --modules="linux normal iso9660 biosdisk search" \
 	    "boot/grub/grub.cfg=/tmp/grub.cfg"
 	cat $NFSROOT/usr/lib/grub/i386-pc/cdboot.img $NFSROOT/tmp/core.img > $scratch/bios.img