[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6581/8267] mkefidsk: fix bash/dash shell quoting problem



commit 7fd1491d2f07c4a6b5dda78a92c1c17f544d642d
Author: Saul Wold <sgw linux intel com>
Date:   Thu Jun 29 13:46:18 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 jhuapl edu>
    
    [YOCTO #9665]
    
    (From OE-Core rev: 008d6cb5bb4969f53a228893c502be8c9420ecb0)
    
    Signed-off-by: Saul Wold <sgw linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/contrib/mkefidisk.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
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


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