From e71577bb8ada10ff8274680674862935458305ee Mon Sep 17 00:00:00 2001
From: Leah Woods <info@minifree.org>
Date: Thu, 19 May 2016 01:51:08 -0400
Subject: build/roms/withgrub: add grub to the ROM using add-payload, not add

---
(limited to 'resources/scripts')

diff --git a/resources/scripts/helpers/build/roms/withgrub_helper b/resources/scripts/helpers/build/roms/withgrub_helper
index 2ceae24..ac00e70 100755
--- a/resources/scripts/helpers/build/roms/withgrub_helper
+++ b/resources/scripts/helpers/build/roms/withgrub_helper
@@ -118,7 +118,7 @@ do
     rm -f "seabios.elf"
 
     # Add the grub.elf to CBFS
-    ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add -f grub.elf -c lzma -n img/grub2.lzma -t raw
+    ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add-payload -c lzma grub.elf img/grub2
     # we dont need that grub.elf now
     rm -f "grub.elf"
 
@@ -129,7 +129,8 @@ do
 
     # Add 0s delay to seabios, so that the user is not burdened by seeing
     # that horrible interface that seabios has
-    dd if=/dev/zero of=zero bs=1 count=1 conv=notrunc
+    rm -f zero
+    dd if=/dev/null of=zero bs=1 count=1
     ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add -f zero -n etc/show-boot-menu -t raw
     rm -f zero
 
--
cgit v0.9.1