summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPranav Tipnis <pranav.tipnis@intel.com>2016-08-19 18:28:41 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-23 17:44:34 +0100
commit9e4e6b91b706880c61ba3d94fa993619430e3e47 (patch)
tree7eda1b6177c70bc0fc44bc86b5e36a4364fe49be
parent63ac3520b4d277ffb0f379397a5415e930c20d1d (diff)
downloadpoky-9e4e6b91b706880c61ba3d94fa993619430e3e47.tar.gz
grub-efi.bbclass: Fix path in startup.nsh for iso image.
The path in startup.nsh for iso image is corrupted as follows: fs0:\EFI\BOOT^Hootx64.efi Using printf will emit correct path which is: fs0:\EFI\BOOT\bootx64.efi This happens because of echo command. Switching to printf like the one used in efi_populate() function. (From OE-Core rev: 7540b9e68d56e7779b478d2bc09fbbedcf28976b) Signed-off-by: Pranav Tipnis <pranav.tipnis@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/grub-efi.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass
index ae8ee382cd..178d0c8350 100644
--- a/meta/classes/grub-efi.bbclass
+++ b/meta/classes/grub-efi.bbclass
@@ -59,7 +59,7 @@ efi_iso_populate() {
59 cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR} 59 cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR}
60 cp $iso_dir/vmlinuz ${EFIIMGDIR} 60 cp $iso_dir/vmlinuz ${EFIIMGDIR}
61 EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g') 61 EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g')
62 echo "fs0:${EFIPATH}\\${GRUB_IMAGE}" > ${EFIIMGDIR}/startup.nsh 62 printf 'fs0:%s\%s\n' "$EFIPATH" "$GRUB_IMAGE" > ${EFIIMGDIR}/startup.nsh
63 if [ -f "$iso_dir/initrd" ] ; then 63 if [ -f "$iso_dir/initrd" ] ; then
64 cp $iso_dir/initrd ${EFIIMGDIR} 64 cp $iso_dir/initrd ${EFIIMGDIR}
65 fi 65 fi