kreyren/guix-kreyren
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Activity

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

Browse Source 
* gnu/bootloader/grub.scm (eye-candy)(font-file): Fix unicode font loading
when booting over TFTP.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
This commit is contained in:
Stefan 2020-12-13 18:25:24 +01:00 committed by Danny Milosavljevic
parent 48cccf06ad
commit 03fb57ff77
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/bootloader/grub.scm
View File

@ -191,9 +191,18 @@ fi~%"
(define font-file (define font-file
(let* ((bootloader (bootloader-configuration-bootloader config)) (let* ((bootloader (bootloader-configuration-bootloader config))
(grub (bootloader-package bootloader))) (grub (bootloader-package bootloader)))
(normalize-file (file-append grub "/share/grub/unicode.pf2") ;; The bootloader-package may be a profile with only symlinks.
store-mount-point ;; If network booting, then a symlink to the font may not work on the
store-directory-prefix))) ;; 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 (define image
(normalize-file (grub-background-image config) (normalize-file (grub-background-image config)