[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2014/8267] grub-efi.bbclass: Fix path in startup.nsh for iso image.



commit 9e4e6b91b706880c61ba3d94fa993619430e3e47
Author: Pranav Tipnis <pranav tipnis intel com>
Date:   Fri Aug 19 18:28:41 2016 -0700

    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>

 meta/classes/grub-efi.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass
index ae8ee38..178d0c8 100644
--- a/meta/classes/grub-efi.bbclass
+++ b/meta/classes/grub-efi.bbclass
@@ -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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]