summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2017-06-29 13:46:18 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-06 14:38:13 +0100
commit7fd1491d2f07c4a6b5dda78a92c1c17f544d642d (patch)
treeb4369bcf60f0f727f3935f942f2014073a0f4d84
parent4b1d270602a0542eef1b497eaf15bad2b747686f (diff)
downloadpoky-7fd1491d2f07c4a6b5dda78a92c1c17f544d642d.tar.gz
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>
-rwxr-xr-xscripts/contrib/mkefidisk.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh
index 800733f0af..ac4ec9c7fb 100755
--- a/scripts/contrib/mkefidisk.sh
+++ b/scripts/contrib/mkefidisk.sh
@@ -444,7 +444,7 @@ if [ -d $ROOTFS_MNT/etc/udev/ ] ; then
444fi 444fi
445 445
446# Add startup.nsh script for automated boot 446# Add startup.nsh script for automated boot
447echo "fs0:\EFI\BOOT\bootx64.efi" > $BOOTFS_MNT/startup.nsh 447printf "fs0:\%s\BOOT\%s\n" "EFI" "bootx64.efi" > $BOOTFS_MNT/startup.nsh
448 448
449 449
450# Call cleanup to unmount devices and images and remove the TMPDIR 450# Call cleanup to unmount devices and images and remove the TMPDIR