Patchwork [4/8] mkefidisk.sh: Copy the EFI dir recursively

login
register
mail settings
Submitter Darren Hart
Date July 16, 2014, 2:16 p.m.
Message ID <1c24512dd36a5d014314adb98c5bfb5872319df1.1405520111.git.dvhart@linux.intel.com>
Download mbox | patch
Permalink /patch/75847/
State Accepted
Commit da682642bae01e9717e5afdad4db62f4c7f406db
Headers show

Comments

Darren Hart - July 16, 2014, 2:16 p.m.
Rather than only copying the EFI/BOOT dir, copy the entire EFI dir
recursively. This allows for custom configurations to be enabled
implicitly with no extra work required.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
 scripts/contrib/mkefidisk.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Patch

diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh
index 9b13041..98c43f5 100755
--- a/scripts/contrib/mkefidisk.sh
+++ b/scripts/contrib/mkefidisk.sh
@@ -264,11 +264,9 @@  umount $HDDIMG_ROOTFS_MNT
 
 echo "Preparing boot partition..."
 EFIDIR="$BOOTFS_MNT/EFI/BOOT"
-mkdir -p $EFIDIR
-
 cp $HDDIMG_MNT/vmlinuz $BOOTFS_MNT
 # Copy the efi loader and configs (booti*.efi and grub.cfg if it exists)
-cp $HDDIMG_MNT/EFI/BOOT/* $EFIDIR
+cp -r $HDDIMG_MNT/EFI $BOOTFS_MNT
 # Silently ignore a missing gummiboot loader dir (we might just be a GRUB image)
 cp -r $HDDIMG_MNT/loader $BOOTFS_MNT 2> /dev/null