From 4b75e601837d4886efe93a6b44e768f8e060dcac Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Mon, 10 Jul 2017 15:03:23 +0200
Subject: [PATCH] fix grub-mkimage; mkdosfs is obsolete

---
 blends/devuan-live/devuan-live.blend | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/blends/devuan-live/devuan-live.blend b/blends/devuan-live/devuan-live.blend
index d46d961..c7fbf63 100644
--- a/blends/devuan-live/devuan-live.blend
+++ b/blends/devuan-live/devuan-live.blend
@@ -172,14 +172,11 @@ EOF
 		tar -cvf memdisk boot
 
 		# make the grub image
-		cat <<EOF | sudo tee ${strapdir}/grubmkimage
-#!/bin/sh
-grub-mkimage -O "x86_64-efi" -m "memdisk" -o "bootx64.efi" \
-	-p '(memdisk)/boot/grub' \
-		search iso9660 configfile normal memdisk tar cat \
-		part_msdos part_gpt fat ext2 ntfs ntfscomp hfsplus \
-		chain boot linux
-EOF
+		grub-mkimage -O "x86_64-efi" -m "memdisk" -o "bootx64.efi" \
+			-p '(memdisk)/boot/grub' \
+				search iso9660 configfile normal memdisk tar cat \
+				part_msdos part_gpt fat ext2 ntfs ntfscomp hfsplus \
+				chain boot linux
 		chroot-script -d grubmkimage
 	popd
 
@@ -188,7 +185,7 @@ EOF
 
 	# Do the boot image "boot/grub/efiboot.img"
 	dd if=/dev/zero of=boot/grub/efiboot.img bs=1K count=1440
-	/sbin/mkdosfs -F 12 boot/grub/efiboot.img
+	mkfs.vfat -F 12 boot/grub/efiboot.img
 
 	sudo mkdir img-mnt
 	sudo mount -o loop boot/grub/efiboot.img img-mnt