[oe-commits] Darren Hart : mkefidisk.sh: Remove initrd entry for gummiboot

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: e405f5e040ff84f4c91fce8473590370c381eaa1
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e405f5e040ff84f4c91fce8473590370c381eaa1

Author: Darren Hart <dvhart at linux.intel.com>
Date:   Mon Jul 21 09:12:48 2014 -0700

mkefidisk.sh: Remove initrd entry for gummiboot

My previous patch adding gummiboot support was missing the line to
remove the initrd line from the boot config. This was an oversight in
copying over the grub setup to gummiboot. Add the necessary logic to
remove it.

Signed-off-by: Darren Hart <dvhart at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 scripts/contrib/mkefidisk.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh
index 7ec373e..ba2b563 100755
--- a/scripts/contrib/mkefidisk.sh
+++ b/scripts/contrib/mkefidisk.sh
@@ -355,6 +355,7 @@ if [ -d "$GUMMI_ENTRIES" ]; then
 		echo "ERROR: $GUMMI_CFG not found"
 	fi
 
+	sed -i "/initrd /d" $GUMMI_CFG
 	sed -i "s@ root=[^ ]*@ @" $GUMMI_CFG
 	sed -i "s at options *LABEL=boot @options LABEL=Boot root=$TARGET_ROOTFS ro rootwait quiet @" $GUMMI_CFG
 fi