From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id sPGiBmFslF9jOAAA0tVLHw (envelope-from ) for ; Sat, 24 Oct 2020 18:03:13 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id sNuUAmFslF+CSQAA1q6Kng (envelope-from ) for ; Sat, 24 Oct 2020 18:03:13 +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 95BED940439 for ; Sat, 24 Oct 2020 18:03:12 +0000 (UTC) Received: from localhost ([::1]:48878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kWNsk-0000Fl-EL for larch@yhetil.org; Sat, 24 Oct 2020 14:03:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42800) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kWNsc-0000EI-KN for bug-guix@gnu.org; Sat, 24 Oct 2020 14:03:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51777) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kWNsc-0003vs-Ao for bug-guix@gnu.org; Sat, 24 Oct 2020 14:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kWNsc-0006D0-7z for bug-guix@gnu.org; Sat, 24 Oct 2020 14:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#44196: [PATCH 1/3] system: Fix grub keymap with store in btrfs subvolume. Resent-From: Miguel =?UTF-8?Q?=C3=81ngel?= Arruga Vivas Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 24 Oct 2020 18:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44196 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 44196@debbugs.gnu.org Received: via spool by 44196-submit@debbugs.gnu.org id=B44196.160356254823819 (code B ref 44196); Sat, 24 Oct 2020 18:03:02 +0000 Received: (at 44196) by debbugs.gnu.org; 24 Oct 2020 18:02:28 +0000 Received: from localhost ([127.0.0.1]:35090 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWNs3-0006C7-RU for submit@debbugs.gnu.org; Sat, 24 Oct 2020 14:02:28 -0400 Received: from mail-wm1-f45.google.com ([209.85.128.45]:51266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWNs1-0006Bu-Fq for 44196@debbugs.gnu.org; Sat, 24 Oct 2020 14:02:26 -0400 Received: by mail-wm1-f45.google.com with SMTP id v5so5826747wmh.1 for <44196@debbugs.gnu.org>; Sat, 24 Oct 2020 11:02:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:in-reply-to:references:user-agent:date:message-id :mime-version:content-disposition:content-description; bh=LKDYKtt2Ki7ymK2a1Ro+v5DKNbxd4XvK/2VLHXT5DM4=; b=eC1MGI4H3/5PsRZ4o1Ici2lwwF8FljoXtCET9tnPmVE7mIa9vvAQbq+eerZNYrm0tp 2WTrV4Fe0f7/qXpb+Cer9L8i/omRXlhyHCUrb/bIqXLv1BXk9orguOebFotuIlpkD2FA U4k/9jskaoyKAjRnK+9lQH0mGpr2P+1TosQM6mi1iVTg542wXDTqVnMnaRFX7G4heEbX jKXHDDgOILTl4UTvkCmVk16KIUNcp+rOJL24CL0o/jyPyG917wAwshfIsGNG3kB0Zzc8 IdlA84RGUWVyTbeIrVW7pT9wDCKqqacz4bWnqcu/Hlb3LiDPVk6NIFxeqvQwxg+CvXyx eIcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:in-reply-to:references :user-agent:date:message-id:mime-version:content-disposition :content-description; bh=LKDYKtt2Ki7ymK2a1Ro+v5DKNbxd4XvK/2VLHXT5DM4=; b=efq9LaLQ1mGbzN3uVZsCeFQ9ZHb9l+2kqbo9w7BKg8L5TWsjoAa6+P8gwipRME3MRL awtd+intWI0IYfW9nkC6oRC534jvm2VEoW36LqYeVH0QBKITJ9HoTgsqFfcXs/nSVt04 zyD3QbPAfPITeUAva6FoSgwC1LbshTe2GUYPzwM/Isx8VStXstij3bcB0kQfCxTK0tBm Hc2ktH1QxJ2Su8sPpgupu1O1Vzx2ZGQBCi4uXq6udMtweonmcZWfqkBGuRLJC962rzbI MojNF1+wsLdl34kyC2lT2wweCwNdqIfcCue/Zt7+G5/wjf4ksY2Mio1EYV6wDBQvT46C vbnA== X-Gm-Message-State: AOAM533V6Ogla4P5VfMyh33uEIkgoKt8+R0nUdeyDitvmXZGCK7XOaSd wf1G7hwHLv+DWfTVtwd5vfJHYjq7BRcU7w== X-Google-Smtp-Source: ABdhPJxEuVPuJp+9nqzyDJhrB5aidwITtL7Q4RC46txXvE7T0agU62z7Z4oJq7iQMr3xOkPpJhB2AQ== X-Received: by 2002:a1c:9695:: with SMTP id y143mr7502183wmd.146.1603562539265; Sat, 24 Oct 2020 11:02:19 -0700 (PDT) Received: from unfall (218.139.134.37.dynamic.jazztel.es. [37.134.139.218]) by smtp.gmail.com with ESMTPSA id l6sm12997644wrt.7.2020.10.24.11.02.18 for <44196@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 11:02:18 -0700 (PDT) From: Miguel =?UTF-8?Q?=C3=81ngel?= Arruga Vivas In-Reply-To: <878sbvh5j4.fsf@gmail.com> ("Miguel =?UTF-8?Q?=C3=81ngel?= Arruga Vivas"'s message of "Sat, 24 Oct 2020 19:56:15 +0200") References: <878sbvh5j4.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) Date: Sat, 24 Oct 2020 20:01:17 +0200 Message-ID: <873623h5aq.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-system-Fix-grub-keymap-with-store-in-btrfs-subvolume.patch Content-Description: 0001-system-fix-grub-keymap.patch X-Spam-Score: 0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -0.8 (/) X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=eC1MGI4H; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Spam-Score: 0.09 X-TUID: osmPxZwbJa4U >From b310cb18021e421be3256b85ab3f2d8f61fe0ab8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?= Date: Sat, 24 Oct 2020 17:48:28 +0200 Subject: [PATCH 1/2] system: Fix grub keymap with store in btrfs subvolume. * gnu/bootloader/grub.scm (grub-configuration-file) [keyboard-layout-config]: Use normalize-file. --- gnu/bootloader/grub.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 611580a350..f1479024e6 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -421,11 +421,12 @@ set lang=~a~%" locale)))) (bootloader-configuration-bootloader config))) (keymap* (and layout (keyboard-layout-file layout #:grub grub))) + (entry (first all-entries)) + (device (menu-entry-device entry)) + (mount-point (menu-entry-device-mount-point entry)) (keymap (and keymap* - (if store-directory-prefix - #~(string-append #$store-directory-prefix - #$keymap*) - keymap*)))) + (normalize-file keymap* mount-point + store-directory-prefix)))) #~(when #$keymap (format port "\ insmod keylayouts -- 2.28.0