From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id KMGKMc5O1l/OawAA0tVLHw (envelope-from ) for ; Sun, 13 Dec 2020 17:26:38 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id FUVnLc5O1l9ucgAAbx9fmQ (envelope-from ) for ; Sun, 13 Dec 2020 17:26:38 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 60CA2940363 for ; Sun, 13 Dec 2020 17:26:38 +0000 (UTC) Received: from localhost ([::1]:57578 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1koV8n-0006BK-77 for larch@yhetil.org; Sun, 13 Dec 2020 12:26:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54374) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1koV8E-0005xm-4X for guix-patches@gnu.org; Sun, 13 Dec 2020 12:26:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:38474) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1koV8D-0001PM-Sp for guix-patches@gnu.org; Sun, 13 Dec 2020 12:26:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1koV8D-0001Xh-Q1 for guix-patches@gnu.org; Sun, 13 Dec 2020 12:26:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45225] [PATCH] gnu: grub: Fix unicode font loading when booting over TFTP. Resent-From: Stefan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Dec 2020 17:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45225 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45225@debbugs.gnu.org, dannym@scratchpost.org X-Debbugs-Original-To: guix-patches@gnu.org, Danny Milosavljevic Received: via spool by submit@debbugs.gnu.org id=B.16078803335889 (code B ref -1); Sun, 13 Dec 2020 17:26:01 +0000 Received: (at submit) by debbugs.gnu.org; 13 Dec 2020 17:25:33 +0000 Received: from localhost ([127.0.0.1]:50020 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1koV7k-0001Wv-Ph for submit@debbugs.gnu.org; Sun, 13 Dec 2020 12:25:33 -0500 Received: from lists.gnu.org ([209.51.188.17]:50032) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1koV7j-0001Wo-JG for submit@debbugs.gnu.org; Sun, 13 Dec 2020 12:25:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54352) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1koV7j-0005Mk-Cn for guix-patches@gnu.org; Sun, 13 Dec 2020 12:25:31 -0500 Received: from smtpout2.vodafonemail.de ([145.253.239.133]:36982) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1koV7h-0001Cs-7Z for guix-patches@gnu.org; Sun, 13 Dec 2020 12:25:30 -0500 Received: from smtp.vodafone.de (unknown [10.2.0.35]) by smtpout2.vodafonemail.de (Postfix) with ESMTP id 4EF291270F7; Sun, 13 Dec 2020 18:25:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vodafonemail.de; s=vfde-smtpout-mb-15sep; t=1607880327; bh=huAfEp6Srl7fdIQS6nPQjmLn9MFk1Np/7PGWD7tMs2s=; h=From:Subject:Date:To; b=LgZ/3zy49VYndtlX9IBwkc+afgM9MPluYouUHsMSsGONTKOVxI+hYe2lfvyX8s96i 09gljFkTkTb6+/vhth/3rKkcd7q6t9otAWQUQpKNc7E7bQHsH0B1Gq9w7MXDTs00CY Urj+vJJEcVy4bF7SzelrzrRT8DzPIxypFKUKxbIU= Received: from macbook-pro.kuh-wiese.my-router.de (dslb-002-202-077-025.002.202.pools.vodafone-ip.de [2.202.77.25]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.vodafone.de (Postfix) with ESMTPSA id 15DA61414DB; Sun, 13 Dec 2020 17:25:27 +0000 (UTC) From: Stefan Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Message-Id: Date: Sun, 13 Dec 2020 18:25:24 +0100 Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) X-Mailer: Apple Mail (2.3124) X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate: clean X-purgate-size: 1635 X-purgate-ID: 155817::1607880327-000006C0-59498E95/0/0 Received-SPF: pass client-ip=145.253.239.133; envelope-from=stefan-guix@vodafonemail.de; helo=smtpout2.vodafonemail.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -0.80 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=vodafonemail.de header.s=vfde-smtpout-mb-15sep header.b=LgZ/3zy4; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 60CA2940363 X-Spam-Score: -0.80 X-Migadu-Scanner: scn1.migadu.com X-TUID: lFoT5UULaGk2 * gnu/bootloader/grub.scm (font-file): Using (canonicalize-path), as = symlinks from a bootloader profile do not work on a tftp server when network = booting. --- gnu/bootloader/grub.scm | 15 ++++++++++++--- 1 file 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) --=20 2.29.2=