From 47283639beb4bbfa1e16347c46cf812c6a9a8d0b Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 8 Jul 2021 16:10:10 -0700 Subject: [PATCH] Install unicode.pf2 from new directory grub2-2.06-3 changes where the unicode.pf2 font file is stored. This changes the efi.tmpl to install it from the new location, which means that it depends on grub2-2.06-3, but there is no way to express this in the runtime-install.tmpl so if you see a failure like: 2021-07-08 16:10:05,586: OSError: nothing matching /var/tmp/lorax/lorax.t80f74er/installroot/boot/grub2/fonts/unicode.pf2 in / it means the new version of grub2 wasn't in the repos you used when running lorax. Fixes #1165 --- share/templates.d/99-generic/efi.tmpl | 2 +- share/templates.d/99-generic/live/efi.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/templates.d/99-generic/efi.tmpl b/share/templates.d/99-generic/efi.tmpl index d73d2d73..bb1aa4f4 100644 --- a/share/templates.d/99-generic/efi.tmpl +++ b/share/templates.d/99-generic/efi.tmpl @@ -17,7 +17,7 @@ install boot/efi/EFI/*/shim${efiarch32|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch32} install boot/efi/EFI/*/mm${efiarch32|lower}.efi ${EFIBOOTDIR}/ install boot/efi/EFI/*/gcd${efiarch32|lower}.efi ${EFIBOOTDIR}/grub${efiarch32|lower}.efi %endif -install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ +install boot/grub2/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ ## actually make the EFI images ${make_efiboot("images/efiboot.img")} diff --git a/share/templates.d/99-generic/live/efi.tmpl b/share/templates.d/99-generic/live/efi.tmpl index 572e07d2..42d18f45 100644 --- a/share/templates.d/99-generic/live/efi.tmpl +++ b/share/templates.d/99-generic/live/efi.tmpl @@ -17,7 +17,7 @@ install boot/efi/EFI/*/shim${efiarch32|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch32} install boot/efi/EFI/*/mm${efiarch32|lower}.efi ${EFIBOOTDIR}/ install boot/efi/EFI/*/gcd${efiarch32|lower}.efi ${EFIBOOTDIR}/grub${efiarch32|lower}.efi %endif -install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ +install boot/grub2/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ ## actually make the EFI images ${make_efiboot("images/efiboot.img")}