summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2014-07-21 09:12:48 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-23 21:59:13 +0100
commitc294bbe52002a70a4d2d027d1f39074b7d27eaef (patch)
treef54e6c09ceaf7f1f295424caaa5f8efb7aa362e8 /scripts
parent6ac058cffe163a871eb0fe24351e421d8530bd2c (diff)
downloadpoky-c294bbe52002a70a4d2d027d1f39074b7d27eaef.tar.gz
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. (From OE-Core rev: c7355550dc21a1ef3c2e828ed5f51e94e12fac5f) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/contrib/mkefidisk.sh1
1 files changed, 1 insertions, 0 deletions
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
355 echo "ERROR: $GUMMI_CFG not found" 355 echo "ERROR: $GUMMI_CFG not found"
356 fi 356 fi
357 357
358 sed -i "/initrd /d" $GUMMI_CFG
358 sed -i "s@ root=[^ ]*@ @" $GUMMI_CFG 359 sed -i "s@ root=[^ ]*@ @" $GUMMI_CFG
359 sed -i "s@options *LABEL=boot @options LABEL=Boot root=$TARGET_ROOTFS ro rootwait quiet @" $GUMMI_CFG 360 sed -i "s@options *LABEL=boot @options LABEL=Boot root=$TARGET_ROOTFS ro rootwait quiet @" $GUMMI_CFG
360fi 361fi