Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tweak the EFI dir naming

This commit is contained in:
Steve McIntyre 2019-01-15 12:59:13 +00:00
parent f3d54b7fa3
commit 3e0615992c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/boot/buster/boot-x86
View File

@ -456,8 +456,8 @@ if [ -d boot$N/isolinux/grub ] && [ $BOOT_EFI -ne 0 ] ; then
echo " Adding EFI boot code for $ARCH on CD$N" echo " Adding EFI boot code for $ARCH on CD$N"
# Move GRUB files to the right place. # Move GRUB files to the right place.
mkdir -p $CDDIR/efi/boot mkdir -p $CDDIR/EFI/boot
mcopy -n -s -i boot$N/isolinux/grub/efi.img '::efi/*' $CDDIR/efi mcopy -n -s -i boot$N/isolinux/grub/efi.img '::efi/*' $CDDIR/EFI
mkdir -p $CDDIR/boot/grub mkdir -p $CDDIR/boot/grub
mv boot$N/isolinux/grub/* $CDDIR/boot/grub/ mv boot$N/isolinux/grub/* $CDDIR/boot/grub/
rmdir boot$N/isolinux/grub rmdir boot$N/isolinux/grub
@ -484,7 +484,7 @@ if [ -d boot$N/isolinux/grub ] && [ $BOOT_EFI -ne 0 ] ; then
cluster_bytes=$((sector_bytes * cluster_sectors)) cluster_bytes=$((sector_bytes * cluster_sectors))
clusters=4 # 1 cluster for each sub-directory clusters=4 # 1 cluster for each sub-directory
for file in $CDDIR/efi/*/*; do for file in $CDDIR/EFI/*/*; do
[ -f "$file" ] || continue [ -f "$file" ] || continue
clusters=$(($clusters + (($(stat -c %s "$file") + $cluster_bytes - 1) / $cluster_bytes))) clusters=$(($clusters + (($(stat -c %s "$file") + $cluster_bytes - 1) / $cluster_bytes)))
done done
@ -514,7 +514,7 @@ if [ -d boot$N/isolinux/grub ] && [ $BOOT_EFI -ne 0 ] ; then
mkfs.msdos -v -C "$CDDIR/boot/grub/efi.img" $blocks >/dev/null mkfs.msdos -v -C "$CDDIR/boot/grub/efi.img" $blocks >/dev/null
mmd -i "$CDDIR/boot/grub/efi.img" ::efi mmd -i "$CDDIR/boot/grub/efi.img" ::efi
mcopy -o -s -i "$CDDIR/boot/grub/efi.img" $CDDIR/efi/* \ mcopy -o -s -i "$CDDIR/boot/grub/efi.img" $CDDIR/EFI/* \
"::efi" "::efi"
if [ $BOOT_EFI = 2 ] ; then if [ $BOOT_EFI = 2 ] ; then