From: Darren Hart <dvhart@linux.intel.com>
Date: Mon, 21 Jul 2014 16:12:48 +0000 (-0700)
Subject: mkefidisk.sh: Remove initrd entry for gummiboot
X-Git-Tag: 2015-4~2241
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=c7355550dc21a1ef3c2e828ed5f51e94e12fac5f;p=openembedded-core.git

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@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh
index 7ec373ef56..ba2b56393b 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@options *LABEL=boot @options LABEL=Boot root=$TARGET_ROOTFS ro rootwait quiet @" $GUMMI_CFG
 fi