From 7a2897149d60816c33c63b7b7254ad283f8c3602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 15 Dec 2020 14:48:19 +0100 Subject: Revert "gnu: grub: Fix unicode font loading when booting over TFTP." This reverts commit 03fb57ff77b57de510b59485845ed7cb4e0a77a7, 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 --- gnu/bootloader/grub.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'gnu/bootloader') diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 3177452dfb..af7b7561ff 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -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) -- cgit v1.2.3