branch master updated: gnu: grub: Fix unicode font loading when booting over TFTP.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

dannym pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 03fb57f  gnu: grub: Fix unicode font loading when booting over TFTP.
03fb57f is described below

commit 03fb57ff77b57de510b59485845ed7cb4e0a77a7
Author: Stefan <stefan-guix@vodafonemail.de>
AuthorDate: Sun Dec 13 18:25:24 2020 +0100

    gnu: grub: Fix unicode font loading when booting over TFTP.
    
    * gnu/bootloader/grub.scm (eye-candy)(font-file): Fix unicode font loading
    when booting over TFTP.
    
    Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
 gnu/bootloader/grub.scm | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm
index af7b756..3177452 100644
--- a/gnu/bootloader/grub.scm
+++ b/gnu/bootloader/grub.scm
@@ -191,9 +191,18 @@ fi~%"
   (define font-file
     (let* ((bootloader (bootloader-configuration-bootloader config))
            (grub (bootloader-package bootloader)))
-      (normalize-file (file-append grub "/share/grub/unicode.pf2")
-                      store-mount-point
-                      store-directory-prefix)))
+      ;; The bootloader-package may be a profile with only symlinks.
+      ;; If network booting, then a symlink to the font may not work on the
+      ;; server side.  Therefore we canonicalize the file name of the font.
+      ;; TODO:  The font gets installed by (install-grub-efi-netboot) and
+      ;; (install-grub-efi).  The installed font could be referred to as
+      ;; "unicode".  But it is currently unclear if (install-grub-disk-image)
+      ;; and (install-grub) both install the font as well.
+      ;; Actually this should be preferred.
+      #~(canonicalize-path
+         #+(normalize-file (file-append grub "/share/grub/unicode.pf2")
+                           store-mount-point
+                           store-directory-prefix))))
 
   (define image
     (normalize-file (grub-background-image config)