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 /gnu/bootloader | |
| parent | 48cccf06ad84f96bb4fc839ab6f26525c7e8dae0 (diff) | |
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>
Diffstat (limited to 'gnu/bootloader')
| -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 af7b7561ff0..3177452dfbf 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm | |||
| @@ -191,9 +191,18 @@ fi~%" | |||
| 191 | (define font-file | 191 | (define font-file |
| 192 | (let* ((bootloader (bootloader-configuration-bootloader config)) | 192 | (let* ((bootloader (bootloader-configuration-bootloader config)) |
| 193 | (grub (bootloader-package bootloader))) | 193 | (grub (bootloader-package bootloader))) |
| 194 | (normalize-file (file-append grub "/share/grub/unicode.pf2") | 194 | ;; The bootloader-package may be a profile with only symlinks. |
| 195 | store-mount-point | 195 | ;; If network booting, then a symlink to the font may not work on the |
| 196 | store-directory-prefix))) | 196 | ;; server side. Therefore we canonicalize the file name of the font. |
| 197 | ;; TODO: The font gets installed by (install-grub-efi-netboot) and | ||
| 198 | ;; (install-grub-efi). The installed font could be referred to as | ||
| 199 | ;; "unicode". But it is currently unclear if (install-grub-disk-image) | ||
| 200 | ;; and (install-grub) both install the font as well. | ||
| 201 | ;; Actually this should be preferred. | ||
| 202 | #~(canonicalize-path | ||
| 203 | #+(normalize-file (file-append grub "/share/grub/unicode.pf2") | ||
| 204 | store-mount-point | ||
| 205 | store-directory-prefix)))) | ||
| 197 | 206 | ||
| 198 | (define image | 207 | (define image |
| 199 | (normalize-file (grub-background-image config) | 208 | (normalize-file (grub-background-image config) |
