[oe-commits] [openembedded-core] 01/02: mkefidsk: fix bash/dash shell quoting problem

git at git.openembedded.org git at git.openembedded.org
Tue Jul 11 23:29:01 UTC 2017


This is an automated email from the git hooks/post-receive script.

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

commit 359722a86580128aeccd05531eff0da4e6971721
Author: Saul Wold <sgw at linux.intel.com>
AuthorDate: Tue Jul 11 08:14:16 2017 -0700

    mkefidsk: fix bash/dash shell quoting problem
    
    mkefidsk currently writes a startup.nsh with embedded control characters.
    This happens because \b etc are control sequences to the shell echo
    command when using dash. The resulting startup.nsh causes the bootup
    to fail, and the user is dropped into the EFI shell to manually run
    startup.nsh.
    
    Patch originally provided by Troy D. Hanson <troy.hanson at jhuapl.edu>
    
    [YOCTO #9665]
    
    Signed-off-by: Saul Wold <sgw at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    (cherry picked from commit 008d6cb5bb4969f53a228893c502be8c9420ecb0)
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 scripts/contrib/mkefidisk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh
index 800733f..ac4ec9c 100755
--- a/scripts/contrib/mkefidisk.sh
+++ b/scripts/contrib/mkefidisk.sh
@@ -444,7 +444,7 @@ if [ -d $ROOTFS_MNT/etc/udev/ ] ; then
 fi
 
 # Add startup.nsh script for automated boot
-echo "fs0:\EFI\BOOT\bootx64.efi" > $BOOTFS_MNT/startup.nsh
+printf "fs0:\%s\BOOT\%s\n" "EFI" "bootx64.efi" > $BOOTFS_MNT/startup.nsh
 
 
 # Call cleanup to unmount devices and images and remove the TMPDIR

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


More information about the Openembedded-commits mailing list