diff options
| author | Stefan <stefan-guix@vodafonemail.de> | 2020-12-13 18:25:24 +0100 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2020-12-14 23:33:22 +0100 |
| commit | 03fb57ff77b57de510b59485845ed7cb4e0a77a7 (patch) | |
| tree | b4555b45eaf504f4a89e79293421ad9fd792438f | |
| parent | 48cccf06ad84f96bb4fc839ab6f26525c7e8dae0 (diff) | |
| download | guix-03fb57ff77b57de510b59485845ed7cb4e0a77a7.tar.gz | |
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>
| -rw-r--r-- | gnu/bootloader/grub.scm | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index af7b7561ff..3177452dfb 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) |