me
/
guix
Archived
1
0
Fork 0
Code

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

This reverts commit 03fb57ff77, which
breaks most system tests.  Specifically, grub.cfg.drv fails to build:

  ERROR: In procedure canonicalize-path:
  In procedure canonicalize-path: No such file or directory
master
Ludovic Courtès 2020-12-15 14:48:19 +01:00
parent 190187326a
commit 7a2897149d
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/bootloader/grub.scm
View File

@ -191,18 +191,9 @@ fi~%"
(define font-file
(let* ((bootloader (bootloader-configuration-bootloader config))
(grub (bootloader-package bootloader)))
;; 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))))
(normalize-file (file-append grub "/share/grub/unicode.pf2")
store-mount-point
store-directory-prefix)))
(define image
(normalize-file (grub-background-image config)