]> code.ossystems Code Review - openembedded-core.git/commitdiff
grub-efi.bbclass: Fix path in startup.nsh for iso image.
authorPranav Tipnis <pranav.tipnis@intel.com>
Sat, 20 Aug 2016 01:28:41 +0000 (18:28 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 23 Aug 2016 16:44:05 +0000 (17:44 +0100)
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.

Signed-off-by: Pranav Tipnis <pranav.tipnis@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/grub-efi.bbclass

index ae8ee382cd4c545abc602e3602bbc0c9e4cc7411..178d0c8350c4ef038d3046681235d04ddea78f14 100644 (file)
@@ -59,7 +59,7 @@ efi_iso_populate() {
        cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR}
        cp $iso_dir/vmlinuz ${EFIIMGDIR}
        EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g')
-       echo "fs0:${EFIPATH}\\${GRUB_IMAGE}" > ${EFIIMGDIR}/startup.nsh
+       printf 'fs0:%s\%s\n' "$EFIPATH" "$GRUB_IMAGE" > ${EFIIMGDIR}/startup.nsh
        if [ -f "$iso_dir/initrd" ] ; then
                cp $iso_dir/initrd ${EFIIMGDIR}
        fi