[oe-commits] [openembedded-core] 05/07: grub-efi.bbclass: Fix path in startup.nsh for iso image.

git at git.openembedded.org git at git.openembedded.org
Mon Aug 22 13:34:17 UTC 2016


rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit ee190dabfccade8090948c41aebd61384ab51d85
Author: Pranav Tipnis <pranav.tipnis at intel.com>
AuthorDate: 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.
    
    Signed-off-by: Pranav Tipnis <pranav.tipnis at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/grub-efi.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list